Mercurial > hg > release > icedtea7-2.6

changeset 2961:c1b0859ec2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3659: Support RHEL multilib installations which use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming 2017-01-25 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3659: Support RHEL multilib installations which use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming * NEWS: Updated. * acinclude.m4: (IT_SET_ARCH_SETTINGS): Set RPM_ARCH where the RPM architecture name is known (Fedora/RHEL build platforms). Remove unused CROSS_TARGET_ARCH from sparc, s390x and sh. (IT_CHECK_FOR_JDK): Depend on IT_SET_ARCH_SETTINGS. Use ${RPM_ARCH} instead of explicit 'x86_64'.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 05 Dec 2018 02:54:49 +0000
parents 250a19341b85
children 86bc30befad5
files ChangeLog NEWS acinclude.m4
diffstat 3 files changed, 27 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Nov 29 21:31:50 2018 +0000
+++ b/ChangeLog	Wed Dec 05 02:54:49 2018 +0000
@@ -1,3 +1,16 @@
+2017-01-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3659: Support RHEL multilib installations which
+	use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_SET_ARCH_SETTINGS): Set RPM_ARCH where the
+	RPM architecture name is known (Fedora/RHEL build
+	platforms). Remove unused CROSS_TARGET_ARCH from
+	sparc, s390x and sh.
+	(IT_CHECK_FOR_JDK): Depend on IT_SET_ARCH_SETTINGS.
+	Use ${RPM_ARCH} instead of explicit 'x86_64'.
+
 2018-11-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to 2.6.15pre01.
--- a/NEWS	Thu Nov 29 21:31:50 2018 +0000
+++ b/NEWS	Wed Dec 05 02:54:49 2018 +0000
@@ -14,6 +14,8 @@
 
 New in release 2.6.15 (2018-11-XX):
 
+* New features
+  - PR3659: Support RHEL multilib installations which use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
 * Backports
   - S8075942, PR3605: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
 * Bug fixes
--- a/acinclude.m4	Thu Nov 29 21:31:50 2018 +0000
+++ b/acinclude.m4	Wed Dec 05 02:54:49 2018 +0000
@@ -5,12 +5,14 @@
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
       JRE_ARCH_DIR=amd64
+      RPM_ARCH=x86_64
       ARCHFLAG="-m64"
       ;;
     i?86)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
       JRE_ARCH_DIR=i386
+      RPM_ARCH=i686
       ARCH_PREFIX=${LINUX32}
       ARCHFLAG="-m32"
       ;;
@@ -23,12 +25,14 @@
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
       JRE_ARCH_DIR=arm
+      RPM_ARCH=armv7hl
       ARCHFLAG="-D_LITTLE_ENDIAN"
       ;;
     arm64|aarch64)
       BUILD_ARCH_DIR=aarch64
       INSTALL_ARCH_DIR=aarch64
       JRE_ARCH_DIR=aarch64
+      RPM_ARCH=aarch64
       ARCHFLAG="-D_LITTLE_ENDIAN"
       ;;
     mips)
@@ -45,6 +49,7 @@
       BUILD_ARCH_DIR=ppc
       INSTALL_ARCH_DIR=ppc
       JRE_ARCH_DIR=ppc
+      RPM_ARCH=ppc
       ARCH_PREFIX=${LINUX32}
       ARCHFLAG="-m32"
       ;;
@@ -52,19 +57,20 @@
       BUILD_ARCH_DIR=ppc64
       INSTALL_ARCH_DIR=ppc64
       JRE_ARCH_DIR=ppc64
+      RPM_ARCH=ppc64
       ARCHFLAG="-m64"
        ;;
     powerpc64le)
       BUILD_ARCH_DIR=ppc64le
       INSTALL_ARCH_DIR=ppc64le
       JRE_ARCH_DIR=ppc64le
+      RPM_ARCH=ppc64le
       ARCHFLAG="-m64"
        ;;
     sparc)
       BUILD_ARCH_DIR=sparc
       INSTALL_ARCH_DIR=sparc
       JRE_ARCH_DIR=sparc
-      CROSS_TARGET_ARCH=sparc
       ARCH_PREFIX=${LINUX32}
       ARCHFLAG="-m32"
        ;;
@@ -78,6 +84,7 @@
       BUILD_ARCH_DIR=s390
       INSTALL_ARCH_DIR=s390
       JRE_ARCH_DIR=s390
+      RPM_ARCH=s390
       ARCH_PREFIX=${LINUX32}
       ARCHFLAG="-m31"
        ;;
@@ -85,14 +92,13 @@
       BUILD_ARCH_DIR=s390x
       INSTALL_ARCH_DIR=s390x
       JRE_ARCH_DIR=s390x
-      CROSS_TARGET_ARCH=s390x
+      RPM_ARCH=s390x
       ARCHFLAG="-m64"
       ;;
     sh*)
       BUILD_ARCH_DIR=sh
       INSTALL_ARCH_DIR=sh
       JRE_ARCH_DIR=sh
-      CROSS_TARGET_ARCH=sh
       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
@@ -1148,6 +1154,7 @@
 
 AC_DEFUN_ONCE([IT_CHECK_FOR_JDK],
 [
+  AC_REQUIRE([IT_SET_ARCH_SETTINGS])
   AC_MSG_CHECKING([for a JDK home directory])
   AC_ARG_WITH([jdk-home],
 	      [AS_HELP_STRING([--with-jdk-home[[=PATH]]],
@@ -1172,10 +1179,10 @@
       BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
     fi
     ICEDTEA6_VMS="/usr/lib/jvm/icedtea-6 /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk
-    		  /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/java-1.6.0-openjdk.x86_64
+    		  /usr/lib/jvm/java-1.6.0-openjdk /usr/lib/jvm/java-1.6.0-openjdk.${RPM_ARCH}
 		  /usr/lib64/jvm/java-1.6.0-openjdk /usr/lib/jvm/java-1.6.0"
     ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-7-openjdk
-                  /usr/lib/jvm/java-1.7.0-openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
+                  /usr/lib/jvm/java-1.7.0-openjdk /usr/lib/jvm/java-1.7.0-openjdk.${RPM_ARCH}
 		  /usr/lib64/jvm/java-1.7.0-openjdk /usr/lib/jvm/java-1.7.0"
     for dir in ${BOOTSTRAP_VMS} ${ICEDTEA7_VMS} ${ICEDTEA6_VMS} \
     	       /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea \