[jbossnative-commits] JBoss Native SVN: r1037 - trunk/build/unix.

[jbossnative-commits at lists.jboss.org]

Author: jfrederic.clere at jboss.com
Date: 2007-09-20 10:07:11 -0400 (Thu, 20 Sep 2007)
New Revision: 1037

Modified:
   trunk/build/unix/build.sh
   trunk/build/unix/buildbin.jboss-sight.sh
Log:
Fix SIGHT build on linux ppc64.


Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh	2007-09-20 11:34:03 UTC (rev 1036)
+++ trunk/build/unix/build.sh	2007-09-20 14:07:11 UTC (rev 1037)
@@ -167,6 +167,9 @@
       export JAVA_HOME
     fi
   ;;
+  ppc64)
+    add_conf="${add_conf} CFLAGS=-m64"
+  ;;
 esac
 
 if [  "x" = "x$BUILD_SYS" ]; then
@@ -400,6 +403,9 @@
      hpux-ia64)
         ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} hpux-ia64-cc
       ;;
+     linux2-ppc64)
+        ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} linux-ppc64
+      ;;
     windows-i686)
         ./Configure ${ssl_target} VC-NT
         ms/do_masm.bat
@@ -470,7 +476,7 @@
     )
   else
     (cd ${apr_srcdir}
-      ./configure --prefix=${apr_common_dir}
+      ./configure ${add_conf} --prefix=${apr_common_dir}
       echo "Building APR ${apr_version} ..."
       make
       make install
@@ -513,7 +519,7 @@
     )
   else
     (cd ${apu_srcdir}
-      ./configure --with-apr=${apu_common_dir} --prefix=${apu_common_dir} --with-expat=builtin --with-dbm=sdbm
+      ./configure ${add_conf} --with-apr=${apu_common_dir} --prefix=${apu_common_dir} --with-expat=builtin --with-dbm=sdbm
       echo "Building APR utilities ${apu_version} ..."
       make
       make install

Modified: trunk/build/unix/buildbin.jboss-sight.sh
===================================================================
--- trunk/build/unix/buildbin.jboss-sight.sh	2007-09-20 11:34:03 UTC (rev 1036)
+++ trunk/build/unix/buildbin.jboss-sight.sh	2007-09-20 14:07:11 UTC (rev 1037)
@@ -48,6 +48,11 @@
 mkdir -p ${output_loc}/lib
 mkdir -p ${output_loc}/doc/sight
 
+case ${BUILD_CPU} in
+  ppc64)
+    add_conf="${add_conf} CFLAGS=-m64 --with-java-home=/opt/jdk"
+esac
+
 # Build native part.
 (cd sight/native
  ./configure ${add_conf} --with-apr=${common_loc} --prefix=${prefix_loc} -enable-layout=generic
@@ -72,11 +77,14 @@
 fi
 
 # Build java part.
+if [ "x" != "x$JAVA_HOME" ]; then
+  jadd_conf="${jadd_conf} -Djava.home=$JAVA_HOME"
+fi
 (cd sight
  echo "Building Sight java"
- ant
- ant javadocs
- ant jar
+ ant ${jadd_conf}
+ ant ${jadd_conf} javadocs
+ ant ${jadd_conf} jar
 )
 
 current_loc=`pwd`