JBoss Native SVN: r2800 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-07-14 03:42:46 -0400 (Thu, 14 Jul 2011)
New Revision: 2800
Modified:
trunk/build/unix/buildbin.jboss-native.sh
Log:
Arrange macosx CFLAGS logic.
Modified: trunk/build/unix/buildbin.jboss-native.sh
===================================================================
--- trunk/build/unix/buildbin.jboss-native.sh 2011-07-13 15:59:41 UTC (rev 2799)
+++ trunk/build/unix/buildbin.jboss-native.sh 2011-07-14 07:42:46 UTC (rev 2800)
@@ -60,12 +60,21 @@
add_conf="${add_conf} --with-ssl=no"
fi
+case ${BUILD_SYS} in
+ macosx-x86)
+ if [ "x$CFLAGS" != "x" ]; then
+ add_conf="${add_conf} CFLAGS=${CFLAGS}"
+ fi
+ ;;
+esac
+
mkdir -p ${output_loc}/bin/${output_lib}
mkdir -p ${output_loc}/bin/${output_bin}
native_sources=srclib/`ls srclib | grep tomcat-native`
# Build native part.
(cd $native_sources
+ echo "Configuring tomcat-native: ./configure {add_conf} --with-apr=${common_loc} --prefix=${prefix_loc} -enable-layout=generic"
./configure ${add_conf} --with-apr=${common_loc} --prefix=${prefix_loc} -enable-layout=generic
if [ $? -ne 0 ]; then
echo "Configure tomcat-native failed"
13 years
JBoss Native SVN: r2799 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-07-13 11:59:41 -0400 (Wed, 13 Jul 2011)
New Revision: 2799
Modified:
trunk/build/unix/build.sh
Log:
According to Mladen we need something like:
CFLAGS='-arch ppc -arch i386 -arch ppc64 -arch x86_64'
APXSLDFLAGS='-arch ppc -arch i386 -arch ppc64 -arch x86_64'
I guess that -arch x86_64 should be enough for current version that are i386 based.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2011-07-13 10:27:37 UTC (rev 2798)
+++ trunk/build/unix/build.sh 2011-07-13 15:59:41 UTC (rev 2799)
@@ -345,7 +345,7 @@
fi
fi
if $force_64; then
- CFLAGS="-m64"
+ CFLAGS="-m64 -arch x86_64"
fi
;;
HP-UX*)
13 years
JBoss Native SVN: r2798 - trunk/build/daemon.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2011-07-13 06:27:37 -0400 (Wed, 13 Jul 2011)
New Revision: 2798
Modified:
trunk/build/daemon/buildnat.sh
Log:
make sure whole build fails if any part fails.
Modified: trunk/build/daemon/buildnat.sh
===================================================================
--- trunk/build/daemon/buildnat.sh 2011-06-22 15:56:15 UTC (rev 2797)
+++ trunk/build/daemon/buildnat.sh 2011-07-13 10:27:37 UTC (rev 2798)
@@ -53,14 +53,14 @@
(cd ../unix
if $build_ssl; then
if $force_64; then
- ./build.sh jboss-native -ssl -cache -64
+ ./build.sh jboss-native -ssl -cache -64 || exit 1
else
- ./build.sh jboss-native -ssl -cache
+ ./build.sh jboss-native -ssl -cache || exit 1
fi
fi
if $force_64; then
- ./build.sh jboss-native -cache -64
+ ./build.sh jboss-native -cache -64 || exit 1
else
- ./build.sh jboss-native -cache
+ ./build.sh jboss-native -cache || exit 1
fi
-)
+) || exit 1
13 years