/hg/release/icedtea7-2.6: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 6 00:24:11 UTC 2018
changeset 6941de3a5f8c in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=6941de3a5f8c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Nov 24 02:28:03 2018 +0000
Start 2.6.15 release cycle.
2018-11-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Add section for 2.6.15.
* configure.ac: Bump to 2.6.15pre00.
changeset 9615e77f53ef in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=9615e77f53ef
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Nov 24 03:43:26 2018 +0000
PR3652: Detect whether -Xprefer:source and -J-Xmx<limit> can be used, rather than assuming
2018-11-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3652: Detect whether -Xprefer:source
and -J-Xmx<limit> can be used, rather than assuming
* Makefile.am:
(PREFER_SOURCE): Define if
COMPILER_SUPPORTS_XPREFERSOURCE is set
by configure.
(MEMORY_LIMIT): Define if
COMPILER_SUPPORTS_MAX_HEAP_SIZE is set
by configure.
* NEWS: Updated.
* acinclude.m4:
(IT_DIAMOND_CHECK): Use 'the Java compiler'
rather than 'javac' to avoid confusion with
the OpenJDK command.
(IT_UNDERSCORE_CHECK): Likewise.
(IT_JAVAC_OPTIONS_CHECK): Check whether the
selected Java compiler supports -Xprefer:source
and -J-Xmx.
* configure.ac: Invoke IT_JAVAC_OPTIONS_CHECK.
changeset 250a19341b85 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=250a19341b85
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Nov 29 21:31:50 2018 +0000
Bump to 2.6.15pre01.
Upstream changes:
- Bump to icedtea-2.6.15pre01
- PR3606: jni_util.c does not import header file which declares getLastErrorString
- S8075942, PR3605: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
ChangeLog:
2018-11-28 Andrew John Hughes <gnu_andrew at member.fsf.org>
Bump to 2.6.15pre01.
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-2.6.15pre01.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated.
* configure.ac: Bump to 2.6.15pre01.
* hotspot.map.in: Update to icedtea-2.6.15pre01.
changeset c1b0859ec2eb in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=c1b0859ec2eb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Dec 05 02:54:49 2018 +0000
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 at 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'.
changeset 86bc30befad5 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=86bc30befad5
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Dec 05 07:16:39 2018 +0000
PR3629: Install symlinks to tapsets in SystemTap directory
2018-09-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3629: Install symlinks to tapsets in SystemTap directory
* INSTALL: Updated and synced with IcedTea 3.x.
* Makefile.am:
(install-exec-local):
Add symlinks to tapsets in system tapset directory.
* NEWS: Updated.
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Set SYSTEMTAP_ARCH_DIR
appropriately for each architecture. Move aarch64/arm64
before arm* as in IcedTea 3.x.
(IT_WITH_TAPSET_DIR): Add option --with-tapset-dir
to allow SystemTap tapset directory to be
specified (defaults to ${datadir}/systemtap/tapset)
* configure.ac:
Invoke IT_WITH_TAPSET_DIR.
changeset b0e507383a9c in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=b0e507383a9c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Dec 06 00:23:09 2018 +0000
PR3663: IcedTea installing symlinks to SystemTap directory rather than individual tapsets
2018-09-27 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3663: IcedTea installing symlinks to SystemTap
directory rather than individual tapsets
* Makefile.am:
(install-exec-local): Add missing '$' so that
${tapname} is correctly expanded.
* NEWS: Updated.
diffstat:
ChangeLog | 87 +++++++++++++++++++++++++++++++++++
INSTALL | 27 +++++-----
Makefile.am | 52 ++++++++++++--------
NEWS | 13 +++++
acinclude.m4 | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
configure.ac | 4 +-
hotspot.map.in | 2 +-
7 files changed, 275 insertions(+), 49 deletions(-)
diffs (truncated from 603 to 500 lines):
diff -r 6327cf1cea9e -r b0e507383a9c ChangeLog
--- a/ChangeLog Thu May 24 05:28:07 2018 +0100
+++ b/ChangeLog Thu Dec 06 00:23:09 2018 +0000
@@ -1,3 +1,90 @@
+2018-09-27 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3663: IcedTea installing symlinks to SystemTap
+ directory rather than individual tapsets
+ * Makefile.am:
+ (install-exec-local): Add missing '$' so that
+ ${tapname} is correctly expanded.
+ * NEWS: Updated.
+
+2018-09-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3629: Install symlinks to tapsets in SystemTap directory
+ * INSTALL: Updated and synced with IcedTea 3.x.
+ * Makefile.am:
+ (install-exec-local):
+ Add symlinks to tapsets in system tapset directory.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Set SYSTEMTAP_ARCH_DIR
+ appropriately for each architecture. Move aarch64/arm64
+ before arm* as in IcedTea 3.x.
+ (IT_WITH_TAPSET_DIR): Add option --with-tapset-dir
+ to allow SystemTap tapset directory to be
+ specified (defaults to ${datadir}/systemtap/tapset)
+ * configure.ac:
+ Invoke IT_WITH_TAPSET_DIR.
+
+2017-01-25 Andrew John Hughes <gnu_andrew at 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 at member.fsf.org>
+
+ Bump to 2.6.15pre01.
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to icedtea-2.6.15pre01.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+ * configure.ac: Bump to 2.6.15pre01.
+ * hotspot.map.in: Update to icedtea-2.6.15pre01.
+
+2018-11-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3652: Detect whether -Xprefer:source
+ and -J-Xmx<limit> can be used, rather than assuming
+ * Makefile.am:
+ (PREFER_SOURCE): Define if
+ COMPILER_SUPPORTS_XPREFERSOURCE is set
+ by configure.
+ (MEMORY_LIMIT): Define if
+ COMPILER_SUPPORTS_MAX_HEAP_SIZE is set
+ by configure.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_DIAMOND_CHECK): Use 'the Java compiler'
+ rather than 'javac' to avoid confusion with
+ the OpenJDK command.
+ (IT_UNDERSCORE_CHECK): Likewise.
+ (IT_JAVAC_OPTIONS_CHECK): Check whether the
+ selected Java compiler supports -Xprefer:source
+ and -J-Xmx.
+ * configure.ac: Invoke IT_JAVAC_OPTIONS_CHECK.
+
+2018-11-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * NEWS: Add section for 2.6.15.
+ * configure.ac: Bump to 2.6.15pre00.
+
2018-04-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3551: Additional category used in jconsole.desktop.in is incorrect
diff -r 6327cf1cea9e -r b0e507383a9c INSTALL
--- a/INSTALL Thu May 24 05:28:07 2018 +0100
+++ b/INSTALL Thu Dec 06 00:23:09 2018 +0000
@@ -29,7 +29,7 @@
libjpeg-devel >= 6b (for --enable-system-jpeg)
zlib-devel (for --enable-system-zlib)
lcms2-devel (for --enable-system-lcms)
-fontconfig (for --enable-system-fontconfig)
+fontconfig (for --enable-system-fontconfig & --enable-improved-font-rendering)
libc6-dev & libattr-devel/libattr1-dev (for --enable-compile-against-syscalls)
libpcsclite (for --enable-system-pcsc)
lksctp-tools (for --enable-system-sctp)
@@ -218,9 +218,10 @@
tarball to be used instead of the standard versions.
* --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
+* --with-tapset-dir: Specify the location of system SystemTap tapsets, defaulting to ${datarootdir}/systemtap/tapset.
* --with-llvm-config: Specify the location of the llvm-config binary.
* --with-version-suffix: Appends the given text to the JDK version output.
-* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
+* --with-hotspot-build: The HotSpot to use, as listed in hotspot.map.in.
* --with-pax: The command used to PaX-mark built binaries.
* --enable-Werror: Turn gcc & javac warnings into errors.
* --disable-jar-compression: Don't compress the OpenJDK JAR files.
@@ -285,7 +286,7 @@
SystemTap
=========
-IcedTea7 includes work to allow the existing DTrace probes included in
+IcedTea includes work to allow the existing DTrace probes included in
OpenJDK to be used with SystemTap. This requires version 0.9.5 or later (0.9.9
or later if you want Java method tracing). The tapset needs to know
the final install location of the JDK, so the --prefix option
@@ -293,8 +294,8 @@
in-tree location of openjdk.build/j2sdk-image and requires
manual changes to tapset/hotspot.stp to work from elsewhere. For
example, if you plan to install the resulting build in
-/usr/lib/jvm/java-1.6.0-openjdk, then you should specify
---prefix=/usr/lib/jvm/java-1.6.0-openjdk.
+/usr/lib/jvm/java-1.7.0-openjdk, then you should specify
+--prefix=/usr/lib/jvm/java-1.7.0-openjdk.
The NSS PKCS11 Security Provider and Elliptic Curve Cryptography
================================================================
@@ -319,7 +320,7 @@
CACAO
=====
-IcedTea7 can use CACAO as the virtual machine, as opposed to HotSpot.
+IcedTea can use CACAO as the virtual machine, as opposed to HotSpot.
One advantage of this is that CACAO has a JIT implementation for
more platforms than HotSpot, including ppc, arm and mips.
When --enable-cacao is specified, CACAO will be downloaded and built,
@@ -332,7 +333,7 @@
JamVM
=====
-IcedTea6 can use JamVM as the virtual machine, as opposed to HotSpot.
+IcedTea can use JamVM as the virtual machine, as opposed to HotSpot.
When --enable-jamvm is specified, JamVM will be downloaded and built,
followed by the JDK portion of OpenJDK resulting in a JamVM+OpenJDK
image in openjdk.build/j2sdk-image. The --with-jamvm-src-zip option
@@ -341,19 +342,19 @@
Zero & Shark
============
-IcedTea7 includes a zero assembler port of HotSpot, which avoids
+IcedTea includes a zero assembler port of HotSpot, which avoids
architecture-specific code as much as possible, allowing an
interpreter to be built and run on most platforms (albeit very
-slowly). As HotSpot only includes JITs for x86, x86_64, AArch64,
-ppc64, ppc64le and SPARC, the zero assembler port is automatically
-enabled on all other architectures. On HotSpot architectures, it may
+slowly). As HotSpot only includes JITs for aarch64, ppc64, ppc64le,
+x86, x86_64 and SPARC, the zero assembler port is automatically enabled
+on all other architectures. On HotSpot-supported architectures, it may
be built using --enable-zero.
To overcome the performance issues inherent in zero, a LLVM-based JIT
called Shark has been developed. This performs Just-In-Time compilation
on any architecture supported by LLVM. To enable it, pass the option
---enable-shark to configure. Please note that Shark is still in
-development and builds are still likely to fail at present.
+--enable-shark to configure. Please note that work on Shark is now
+abandoned and builds may fail.
On ARM32, there is also a native JIT port built on top of Zero, which
is built on this platform by default.
diff -r 6327cf1cea9e -r b0e507383a9c Makefile.am
--- a/Makefile.am Thu May 24 05:28:07 2018 +0100
+++ b/Makefile.am Thu Dec 06 00:23:09 2018 +0000
@@ -4,19 +4,19 @@
BUILD_VERSION = b01
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 8931f7345917
-JAXP_CHANGESET = 71fb2bb2ccdf
-JAXWS_CHANGESET = 46e5171dd4ab
-JDK_CHANGESET = 581773232054
-LANGTOOLS_CHANGESET = 3633e24edab7
-OPENJDK_CHANGESET = 474d8c372eca
-
-CORBA_SHA256SUM = 666c1d42bad6d9465c0684673d3a82f9a3bdf2590291784133200ae8c2a8ce98
-JAXP_SHA256SUM = 3b5a9922584b88b9ab1add1254b60fc1adbe0bc77a96792c70ea0897d4cae7f2
-JAXWS_SHA256SUM = 10e3faee46767afe035f38e43b52de36bd21b12e85193204dcd5151b4bdf58f1
-JDK_SHA256SUM = 0bf1abcbc3e24f79ada234c10421e05bdc5e1fb1662a114db2437e1f6967e68e
-LANGTOOLS_SHA256SUM = 4892a4c0beab6b9758e907ec92f49057711bf1152da99e04ef3318e809dc295b
-OPENJDK_SHA256SUM = c20078bf70f84e0c84948e7c2d813f6e415151ac42c16663cb93b84e2b8b018d
+CORBA_CHANGESET = 1ed1155692c8
+JAXP_CHANGESET = 8ddbfae3207e
+JAXWS_CHANGESET = 37868584eef3
+JDK_CHANGESET = 384dd407114d
+LANGTOOLS_CHANGESET = 7c19cbad9291
+OPENJDK_CHANGESET = 3cf747ef8b14
+
+CORBA_SHA256SUM = 42e01b319b206ca7bd5fae0c910830853f865459ce63f21e16ae860db7fcc45e
+JAXP_SHA256SUM = eb28e7e7e271e27155f21a48fd81ba58a8be577e32a350bfcd7bb65e4fa40202
+JAXWS_SHA256SUM = 9e6b4ed782df9c7be26027589b58002ac06940d82bb0b5120e85fedd727abd05
+JDK_SHA256SUM = b747fd71a8037a30b8ddf73d7182b6a1eab670b6f0bcdd8cb878aa0a6a31fda9
+LANGTOOLS_SHA256SUM = f3beac312b83dad3ae0d783da291e2fd0752a15a723f870083a4977906b94545
+OPENJDK_SHA256SUM = 6a993ad99d0f7f226a07fb7549659e9e340839ec560609f25c2abc4d93051ca4
DROP_URL = http://icedtea.classpath.org/download/drops
@@ -287,15 +287,16 @@
REV_ARG = -r $(HGREV)
endif
-# This should not depend on bootstrapping
-# but on whether MEMORY_LIMIT is accepted
-# as an argument to javac
-if BOOTSTRAPPING
+if COMPILER_SUPPORTS_XPREFERSOURCE
+ PREFER_SOURCE = -Xprefer:source
+else
+ PREFER_SOURCE =
+endif
+
+if COMPILER_SUPPORTS_MAX_HEAP_SIZE
+ MEMORY_LIMIT = -J-Xmx1024m
+else
MEMORY_LIMIT =
- PREFER_SOURCE =
-else
- MEMORY_LIMIT = -J-Xmx1024m
- PREFER_SOURCE = -Xprefer:source
endif
if ENABLE_CACAO
@@ -3260,9 +3261,18 @@
for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \
$(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/ext,$(INSTALL_DATA));\
done
+if ENABLE_SYSTEMTAP
+if WITH_TAPSET_DIR
+ stapdest="$(DESTDIR)$(TAPSET_DIR)/$(SYSTEMTAP_ARCH_DIR)" ; \
for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \
$(call install_file,$${files},$(DESTDIR)${prefix}/tapset,$(INSTALL_DATA));\
+ ${mkinstalldirs} $${stapdest} ; \
+ tapname=$$(basename $${files}); \
+ destname=$${tapname/./- at JAVA_VER@.} ; \
+ ln -s ${prefix}/tapset/$${tapname} $${stapdest}/$${destname} ; \
done
+endif
+endif
$(abs_top_builddir)/pax-mark-vm $(DESTDIR)${prefix} false
install-data-local:
diff -r 6327cf1cea9e -r b0e507383a9c NEWS
--- a/NEWS Thu May 24 05:28:07 2018 +0100
+++ b/NEWS Thu Dec 06 00:23:09 2018 +0000
@@ -12,6 +12,17 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+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
+ - PR3606: jni_util.c does not import header file which declares getLastErrorString
+ - PR3652: Detect whether -Xprefer:source and -J-Xmx<limit> can be used, rather than assuming
+ - PR3663: IcedTea installing symlinks to SystemTap directory rather than individual tapsets
+
New in release 2.6.14 (2018-05-23):
* Security fixes
@@ -2023,6 +2034,8 @@
New in release 2.5.2 (2014-08-29):
+* New features
+ - PR3629: Install symlinks to tapsets in SystemTap directory
* Backports
- S8049480: Current versions of Java can't verify jars signed and timestamped with Java 9
- S8051012, LP1360392: Regression in verifier for <init> method call from inside of a branch
diff -r 6327cf1cea9e -r b0e507383a9c acinclude.m4
--- a/acinclude.m4 Thu May 24 05:28:07 2018 +0100
+++ b/acinclude.m4 Thu Dec 06 00:23:09 2018 +0000
@@ -5,12 +5,16 @@
BUILD_ARCH_DIR=amd64
INSTALL_ARCH_DIR=amd64
JRE_ARCH_DIR=amd64
+ RPM_ARCH=x86_64
+ SYSTEMTAP_ARCH_DIR=x86_64
ARCHFLAG="-m64"
;;
i?86)
BUILD_ARCH_DIR=i586
INSTALL_ARCH_DIR=i386
JRE_ARCH_DIR=i386
+ RPM_ARCH=i686
+ SYSTEMTAP_ARCH_DIR=i386
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m32"
;;
@@ -18,33 +22,42 @@
BUILD_ARCH_DIR=alpha
INSTALL_ARCH_DIR=alpha
JRE_ARCH_DIR=alpha
+ SYSTEMTAP_ARCH_DIR=alpha
+ ;;
+ arm64|aarch64)
+ BUILD_ARCH_DIR=aarch64
+ INSTALL_ARCH_DIR=aarch64
+ JRE_ARCH_DIR=aarch64
+ RPM_ARCH=aarch64
+ SYSTEMTAP_ARCH_DIR=arm64
+ ARCHFLAG="-D_LITTLE_ENDIAN"
;;
arm*)
BUILD_ARCH_DIR=arm
INSTALL_ARCH_DIR=arm
JRE_ARCH_DIR=arm
- ARCHFLAG="-D_LITTLE_ENDIAN"
- ;;
- arm64|aarch64)
- BUILD_ARCH_DIR=aarch64
- INSTALL_ARCH_DIR=aarch64
- JRE_ARCH_DIR=aarch64
+ RPM_ARCH=armv7hl
+ SYSTEMTAP_ARCH_DIR=arm
ARCHFLAG="-D_LITTLE_ENDIAN"
;;
mips)
BUILD_ARCH_DIR=mips
INSTALL_ARCH_DIR=mips
JRE_ARCH_DIR=mips
+ SYSTEMTAP_ARCH_DIR=mips
;;
mipsel)
BUILD_ARCH_DIR=mipsel
INSTALL_ARCH_DIR=mipsel
JRE_ARCH_DIR=mipsel
+ SYSTEMTAP_ARCH_DIR=mips
;;
powerpc)
BUILD_ARCH_DIR=ppc
INSTALL_ARCH_DIR=ppc
JRE_ARCH_DIR=ppc
+ RPM_ARCH=ppc
+ SYSTEMTAP_ARCH_DIR=powerpc
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m32"
;;
@@ -52,19 +65,23 @@
BUILD_ARCH_DIR=ppc64
INSTALL_ARCH_DIR=ppc64
JRE_ARCH_DIR=ppc64
+ RPM_ARCH=ppc64
+ SYSTEMTAP_ARCH_DIR=powerpc
ARCHFLAG="-m64"
;;
powerpc64le)
BUILD_ARCH_DIR=ppc64le
INSTALL_ARCH_DIR=ppc64le
JRE_ARCH_DIR=ppc64le
+ RPM_ARCH=ppc64le
+ SYSTEMTAP_ARCH_DIR=powerpc
ARCHFLAG="-m64"
;;
sparc)
BUILD_ARCH_DIR=sparc
INSTALL_ARCH_DIR=sparc
JRE_ARCH_DIR=sparc
- CROSS_TARGET_ARCH=sparc
+ SYSTEMTAP_ARCH_DIR=sparc
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m32"
;;
@@ -72,12 +89,15 @@
BUILD_ARCH_DIR=sparcv9
INSTALL_ARCH_DIR=sparcv9
JRE_ARCH_DIR=sparc64
+ SYSTEMTAP_ARCH_DIR=sparc
ARCHFLAG="-m64"
;;
s390)
BUILD_ARCH_DIR=s390
INSTALL_ARCH_DIR=s390
JRE_ARCH_DIR=s390
+ RPM_ARCH=s390
+ SYSTEMTAP_ARCH_DIR=s390
ARCH_PREFIX=${LINUX32}
ARCHFLAG="-m31"
;;
@@ -85,24 +105,27 @@
BUILD_ARCH_DIR=s390x
INSTALL_ARCH_DIR=s390x
JRE_ARCH_DIR=s390x
- CROSS_TARGET_ARCH=s390x
+ RPM_ARCH=s390x
+ SYSTEMTAP_ARCH_DIR=s390
ARCHFLAG="-m64"
;;
sh*)
BUILD_ARCH_DIR=sh
INSTALL_ARCH_DIR=sh
JRE_ARCH_DIR=sh
- CROSS_TARGET_ARCH=sh
+ SYSTEMTAP_ARCH_DIR=sh
;;
*)
BUILD_ARCH_DIR=`uname -m`
INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
JRE_ARCH_DIR=$INSTALL_ARCH_DIR
+ SYSTEMTAP_ARCH_DIR=$INSTALL_ARCH_DIR
;;
esac
AC_SUBST(BUILD_ARCH_DIR)
AC_SUBST(INSTALL_ARCH_DIR)
AC_SUBST(JRE_ARCH_DIR)
+ AC_SUBST(SYSTEMTAP_ARCH_DIR)
AC_SUBST(ARCH_PREFIX)
AC_SUBST(ARCHFLAG)
])
@@ -1148,6 +1171,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 +1196,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 \
@@ -1797,7 +1821,7 @@
AC_DEFUN([IT_DIAMOND_CHECK],[
AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
- AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [
+ AC_CACHE_CHECK([if the Java compiler lacks support for the diamond operator], it_cv_diamond, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
mkdir tmp.$$
@@ -2879,6 +2903,33 @@
fi
])
+AC_DEFUN([IT_WITH_TAPSET_DIR],
+[
+ TAPSET_DEFAULT="${datadir}/systemtap/tapset"
+ AC_MSG_CHECKING([which SystemTap tapset directory to use])
+ AC_ARG_WITH([tapset-dir],
+ [AS_HELP_STRING(--with-tapset-dir,set the SystemTap tapset directory [[default=DATAROOTDIR/systemtap/tapset]])],
+ [
+ if test "x${withval}" = x || test "x${withval}" = xyes; then
+ TAPSET_DIR="${TAPSET_DEFAULT}"
+ else
+ TAPSET_DIR="${withval}"
+ fi
+ ],
+ [
+ TAPSET_DIR="${TAPSET_DEFAULT}"
+ ])
+ if test "x${TAPSET_DIR}" = "xno"; then
+ TAPSET_DIR=none
+ TAPSET_DIR_SET=no
+ else
+ TAPSET_DIR_SET=yes
+ fi
+ AC_MSG_RESULT([${TAPSET_DIR}])
+ AC_SUBST([TAPSET_DIR])
+ AM_CONDITIONAL(WITH_TAPSET_DIR, test "x${TAPSET_DIR_SET}" = "xyes")
+])
+
AC_DEFUN_ONCE([IT_HAS_NATIVE_HOTSPOT_PORT],
[
AC_MSG_CHECKING([if a native HotSpot port is available for this architecture])
@@ -2979,7 +3030,7 @@
AC_DEFUN([IT_UNDERSCORE_CHECK],[
AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
More information about the distro-pkg-dev
mailing list