September 2014 - jbossnative-commits

JBoss Native SVN: r3372 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-09-09 11:53:46 -0400 (Tue, 09 Sep 2014) New Revision: 3372 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Add message when failed. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-09-09 09:26:47 UTC (rev 3371) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-09-09 15:53:46 UTC (rev 3372) @@ -219,6 +219,10 @@ # Install it (and more the prefork one). mkdir -p $RPM_BUILD_ROOT/mod_cluster_worker make DESTDIR=$RPM_BUILD_ROOT/mod_cluster_worker install +if [ $? -ne 0 ]; then + echo "mpmbuild worker install failed" + exit 1 +fi mv ${RPM_BUILD_ROOT}/${_sbindir}/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.prefork cp ${RPM_BUILD_ROOT}/mod_cluster_worker/${_sbindir}/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd rm -rf ${RPM_BUILD_ROOT}/mod_cluster_worker

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3371 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-09-09 05:26:47 -0400 (Tue, 09 Sep 2014) New Revision: 3371 Modified: trunk/build/unix/build.sh Log: t seems pcre requires it... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-09-08 15:44:22 UTC (rev 3370) +++ trunk/build/unix/build.sh 2014-09-09 09:26:47 UTC (rev 3371) @@ -397,6 +397,8 @@ BUILD_SYS="hpux" if [ -f /opt/aCC/bin/cc ]; then CC=/opt/aCC/bin/cc + CFLAGS="+u1" + export CFLAGS else CC=cc fi

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3370 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-09-08 11:44:22 -0400 (Mon, 08 Sep 2014) New Revision: 3370 Modified: trunk/build/unix/build.sh Log: Add --with-pic for pcre... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-09-08 14:00:19 UTC (rev 3369) +++ trunk/build/unix/build.sh 2014-09-08 15:44:22 UTC (rev 3370) @@ -1064,7 +1064,7 @@ (cd ${any_srcdir} echo "Building in ${any_srcdir} ..." if $any_static ; then - add_static="--enable-static --disable-shared" + add_static="--with-pic --enable-static --disable-shared" else add_static="" fi

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3369 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-09-08 10:00:19 -0400 (Mon, 08 Sep 2014) New Revision: 3369 Modified: trunk/build/unix/build.sh trunk/build/unix/buildbin.mod_cluster.sh Log: Build pcre before httpd and use ours. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-09-05 12:01:28 UTC (rev 3368) +++ trunk/build/unix/build.sh 2014-09-08 14:00:19 UTC (rev 3369) @@ -317,6 +317,10 @@ case ${BUILD_SYS} in Linux*) BUILD_SYS="linux2" + if $has_pcre; then + build_pcre=true + fi + # Solaris compiler could do 32 or 64 bits. ;; SunOS*) BUILD_SYS="solaris" @@ -343,6 +347,9 @@ if $has_expat; then build_expat=true fi + if $has_pcre; then + build_pcre=true + fi # Solaris compiler could do 32 or 64 bits. if $force_64; then if [ "xx86" = "x$BUILD_SYS" ]; then @@ -369,6 +376,10 @@ if $has_expat; then build_expat=true fi + if $has_pcre; then + build_pcre=true + fi + # Solaris compiler could do 32 or 64 bits. if [ "x${JAVA_HOME}" = "x" ]; then JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home export JAVA_HOME @@ -396,6 +407,10 @@ build_zlib=true fi fi + if $has_pcre; then + build_pcre=true + fi + # Solaris compiler could do 32 or 64 bits. if [ $BUILD_CPU = "parisc2" ]; then if $force_64; then BUILD_SYS="hpux64" @@ -519,6 +534,7 @@ export build_iconv export build_expat export build_zlib +export build_pcre export NATIVEEOL export BUILD_SYS @@ -1140,6 +1156,11 @@ buildany srclib/expat-${expat_version} true || return 1 fi + # build a static expat. + if $build_pcre; then + buildany srclib/pcre-${pcre_version} true || return 1 + fi + if $build_apr; then if $has_static ; then buildapr srclib/apr-${apr_version} true || return 1 Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-09-05 12:01:28 UTC (rev 3368) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-09-08 14:00:19 UTC (rev 3369) @@ -82,7 +82,6 @@ --with-suexec-logfile=${_localstatedir}/log/httpd/suexec.log \ --with-suexec-bin=${_sbindir}/suexec \ --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ - --with-pcre=builtin \ $* || exit 1 make clean || exit 1 make || exit 1 @@ -125,6 +124,12 @@ if $build_zlib; then add_conf_sys="$add_conf_sys --with-z=${build_common_dir}-static/" fi +if $build_pcre; then + add_conf_sys="--with-pcre=${build_common_dir}-static/" +else + add_conf_sys="$add_conf_sys --with-pcre=builtin" +fi + # Process mod_jk if needed. native_sources=srclib/`ls srclib | grep httpd-` cd $native_sources

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3368 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-09-05 08:01:28 -0400 (Fri, 05 Sep 2014) New Revision: 3368 Modified: trunk/build/unix/build.sh Log: Comment out CFLAGS=-O2 than break HPUX. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-09-05 10:27:25 UTC (rev 3367) +++ trunk/build/unix/build.sh 2014-09-05 12:01:28 UTC (rev 3368) @@ -510,8 +510,8 @@ fi # Is this a wrong place to do this? :-/ -CFLAGS="${CFLAGS} -O2" -export CFLAGS +#CFLAGS="${CFLAGS} -O2" +#export CFLAGS export has_jk export has_cluster

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3367 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3366 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3365 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-09-03 10:41:41 -0400 (Wed, 03 Sep 2014) New Revision: 3365 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: on HPUX you can't overwrite .so files any if it is there no need to copy. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-09-03 10:25:58 UTC (rev 3364) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-09-03 14:41:41 UTC (rev 3365) @@ -421,8 +421,12 @@ do nfile=`echo $file | sed 's:\.sl:\.so:'` cp -p $file ../../target/$nfile - echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile" - cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile + if [ -f ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile ]; then + echo "${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile already there" + else + echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile" + cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules/$nfile + fi done ) || exit 1 done

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3364 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-09-03 06:25:58 -0400 (Wed, 03 Sep 2014) New Revision: 3364 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildsrc.mod_cluster.sh Log: for httpd-2.4.x we don't need jlibtool. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-09-03 05:59:41 UTC (rev 3363) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-09-03 10:25:58 UTC (rev 3364) @@ -156,7 +156,7 @@ add_conf_sys="$add_conf_sys --enable-pie" ;; hpux*) - add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared --without-pgsql" + add_conf_sys="$add_conf_sys --without-pgsql" ;; esac case ${BUILD_CPU} in Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-09-03 05:59:41 UTC (rev 3363) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-09-03 10:25:58 UTC (rev 3364) @@ -164,18 +164,8 @@ exit 1 fi -# Replace libtool by our libtool -# and/or regenerate configure. +# regenerate configure. case ${BUILD_SYS} in - hpux*) - echo "${build_top}/util/jlibtool.c ${dirsources}/srclib/apr/build" - cp ${build_top}/util/jlibtool.c ${dirsources}/srclib/apr/build - if $has_jk; then - (cd ${dirsources}/modules/jk - autoconf || exit 1 - ) || exit 1 - fi - ;; windows) echo "windows no buildconf" ;;

9 years, 7 months

1
0
0 / 0

JBoss Native SVN: r3363 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

9 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits September 2014