Mercurial > hg > release > icedtea6-1.12

changeset 9:3ee6d78cabc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Committing Gary Benson's patch
author Lillian Angel <langel@redhat.com>
date Fri, 08 Jun 2007 10:03:15 -0400
parents 123c2340f9cf
children 33363fc77b08
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure
diffstat 5 files changed, 24 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 07 19:21:19 2007 -0400
+++ b/ChangeLog	Fri Jun 08 10:03:15 2007 -0400
@@ -1,3 +1,13 @@
+2007-06-08  Gary Benson  <gbenson@redhat.com>
+
+	* acinclude.m4 (SET_ARCH_DIRS):
+	Deal with platforms other than ix86 and x86_64.
+	* configure: Regenerated.
+
+	* icedtea-ports.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Add the above.
+	* Makefile.in: Regenerated.
+
 2007-06-07  Francis Kung  <fkung@redhat.com>
 
 	* acinclude.m4: Add explicit xalan/xerces checks.
--- a/Makefile.am	Thu Jun 07 19:21:19 2007 -0400
+++ b/Makefile.am	Fri Jun 08 10:03:15 2007 -0400
@@ -8,7 +8,8 @@
 
 ICEDTEA_PATCHES = \
 	icedtea-copy-plugs.patch \
-	icedtea-lesstif.patch
+	icedtea-lesstif.patch \
+	icedtea-ports.patch
 
 ICEDTEA_ECJ_PATCH = \
 	icedtea-ecj-bootstrap.patch
--- a/Makefile.in	Thu Jun 07 19:21:19 2007 -0400
+++ b/Makefile.in	Fri Jun 08 10:03:15 2007 -0400
@@ -176,7 +176,8 @@
 OPENJDK_MD5SUM = c6b0ebe02022dda481285b63cd2af5ae
 ICEDTEA_PATCHES = \
 	icedtea-copy-plugs.patch \
-	icedtea-lesstif.patch
+	icedtea-lesstif.patch \
+	icedtea-ports.patch
 
 ICEDTEA_ECJ_PATCH = \
 	icedtea-ecj-bootstrap.patch
--- a/acinclude.m4	Thu Jun 07 19:21:19 2007 -0400
+++ b/acinclude.m4	Fri Jun 08 10:03:15 2007 -0400
@@ -5,10 +5,14 @@
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
       ;;
-    *)
+    i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       ;;
+    *)
+      BUILD_ARCH_DIR=`uname -m`
+      INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      ;;
   esac
   AC_SUBST(BUILD_ARCH_DIR)
   AC_SUBST(INSTALL_ARCH_DIR)
--- a/configure	Thu Jun 07 19:21:19 2007 -0400
+++ b/configure	Fri Jun 08 10:03:15 2007 -0400
@@ -3851,10 +3851,14 @@
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
       ;;
-    *)
+    i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       ;;
+    *)
+      BUILD_ARCH_DIR=`uname -m`
+      INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      ;;
   esac