Mercurial > hg > release > icedtea6-1.4

changeset 1254:8634e13d4a4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A couple of extras spotted by doko: 2008-12-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Prefix the call to uname -m with the ${ARCH_PREFIX}. * acinclude.m4: Apply linux32 on s390 as well.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 04 Dec 2008 17:49:29 +0000
parents c6e9607b19f0
children 644b7ff854fc
files ChangeLog Makefile.am acinclude.m4
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Dec 04 17:24:48 2008 +0000
+++ b/ChangeLog	Thu Dec 04 17:49:29 2008 +0000
@@ -1,3 +1,11 @@
+2008-12-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	Prefix the call to uname -m with
+	the ${ARCH_PREFIX}.
+	* acinclude.m4:
+	Apply linux32 on s390 as well.
+
 2008-12-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* Makefile.am:
--- a/Makefile.am	Thu Dec 04 17:24:48 2008 +0000
+++ b/Makefile.am	Thu Dec 04 17:49:29 2008 +0000
@@ -1764,7 +1764,7 @@
 	ln -s $(SYSTEM_NETBEANS_DIR)/java2/ ./nbbuild/netbeans/java2 ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/ide9/ ./nbbuild/netbeans/ide9 ; \
 	cd profiler.cvs/libs/jfluid/native/build ; \
-	if ! (uname -a | grep x86_64) ; then \
+	if ! ($(ARCH_PREFIX) uname -a | grep x86_64) ; then \
 	  buildscript=./buildnative-linux-15.sh ; \
 	else \
 	  buildscript=./buildnative-linux64-15.sh ; \
--- a/acinclude.m4	Thu Dec 04 17:24:48 2008 +0000
+++ b/acinclude.m4	Thu Dec 04 17:49:29 2008 +0000
@@ -52,6 +52,7 @@
       BUILD_ARCH_DIR=s390
       INSTALL_ARCH_DIR=s390
       JRE_ARCH_DIR=s390
+      ARCH_PREFIX=${LINUX32}
        ;;
     *)
       BUILD_ARCH_DIR=`uname -m`