# HG changeset patch # User Andrew John Hughes # Date 1459488496 -3600 # Node ID 6749369df844d57b35125f41793f20fb29ade50a # Parent 548cabd036a95844d4dd5b41b19f80fa6abca5dc PR2907: Replace --with-abs-install-dir with usual --prefix 2016-03-31 Andrew John Hughes PR2907: Replace --with-abs-install-dir with usual --prefix * NEWS: Updated. 2014-06-04 Andrew John Hughes PR2907: Replace --with-abs-install-dir with usual --prefix * INSTALL: Replace documentation of --with-abs-install-dir with --prefix. Fix typo. * Makefile.am: (ICEDTEA_ENV): Set INSTALL_LOCATION to prefix. * configure.ac: Drop abs-install-dir option and use prefix in ABS_CLIENT_LIBJVM_SO and ABS_SERVER_LIBJVM_SO instead. * tapset/hotspot.stp.in, * tapset/hotspot_jni.stp.in, * tapset/jstack.stp.in: Replace ABS_JAVA_HOME_DIR with prefix. diff -r 548cabd036a9 -r 6749369df844 ChangeLog --- a/ChangeLog Fri Apr 01 06:19:20 2016 +0100 +++ b/ChangeLog Fri Apr 01 06:28:16 2016 +0100 @@ -1,3 +1,25 @@ +2016-03-31 Andrew John Hughes + + PR2907: Replace --with-abs-install-dir + with usual --prefix + * NEWS: Updated. + +2014-06-04 Andrew John Hughes + + PR2907: Replace --with-abs-install-dir + with usual --prefix + * INSTALL: Replace documentation of + --with-abs-install-dir with --prefix. Fix typo. + * Makefile.am: + (ICEDTEA_ENV): Set INSTALL_LOCATION to prefix. + * configure.ac: Drop abs-install-dir + option and use prefix in ABS_CLIENT_LIBJVM_SO and + ABS_SERVER_LIBJVM_SO instead. + * tapset/hotspot.stp.in, + * tapset/hotspot_jni.stp.in, + * tapset/jstack.stp.in: + Replace ABS_JAVA_HOME_DIR with prefix. + 2016-03-31 Andrew John Hughes PR2906: Support prefixed variants of GNU diff -r 548cabd036a9 -r 6749369df844 INSTALL --- a/INSTALL Fri Apr 01 06:19:20 2016 +0100 +++ b/INSTALL Fri Apr 01 06:28:16 2016 +0100 @@ -68,7 +68,7 @@ There is currently no install target. IcedTea ends up in openjdk.build when the build completes. -Most targets in IcedTea creat stamp files in the stamps directory to +Most targets in IcedTea create stamp files in the stamps directory to determine what and when dependencies were compiled. Each target has a corresponding clean-x target which removes the output and the stamp file, allowing it to be rebuilt. For example, stamps/rt.stamp (alias @@ -81,6 +81,7 @@ The build process may be modified by passing the following options to configure: +* --prefix: The final install location of the j2sdk-image. * --disable-docs: Don't build the Javadoc documentation. * --disable-bootstrap: Perform a quick (no bootstrap) build using an installed copy of IcedTea6 or IcedTea7. If a directory is not specified, a check against @@ -186,7 +187,6 @@ --with-jamvm-src-zip at all. This option allows a locally modified version of the source 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-abs-install-dir: The final install location of the j2sdk-image, for use in the 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-cacerts-file: Specify the location of a cacerts file, defaulting to diff -r 548cabd036a9 -r 6749369df844 Makefile.am --- a/Makefile.am Fri Apr 01 06:19:20 2016 +0100 +++ b/Makefile.am Fri Apr 01 06:28:16 2016 +0100 @@ -529,7 +529,8 @@ DEBUG_BINARIES="true" \ LOG="debug" SCTP_WERROR= \ POST_STRIP_CMD= STRIP_POLICY="no_strip" \ - JOBS="$(PARALLEL_JOBS)" + JOBS="$(PARALLEL_JOBS)" \ + INSTALL_LOCATION="${prefix}" if DISABLE_OPTIMIZATIONS ICEDTEA_ENV += \ diff -r 548cabd036a9 -r 6749369df844 NEWS --- a/NEWS Fri Apr 01 06:19:20 2016 +0100 +++ b/NEWS Fri Apr 01 06:28:16 2016 +0100 @@ -160,6 +160,7 @@ - PR2880: Add missing test directory in make check. - PR2885: Location of 'stap' executable is hard-coded - PR2906: Support prefixed variants of GNU tools used on *BSD systems + - PR2907: Replace --with-abs-install-dir with usual --prefix - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck diff -r 548cabd036a9 -r 6749369df844 configure.ac --- a/configure.ac Fri Apr 01 06:19:20 2016 +0100 +++ b/configure.ac Fri Apr 01 06:28:16 2016 +0100 @@ -256,19 +256,8 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes]) -AC_MSG_CHECKING([for absolute java home install dir]) -AC_ARG_WITH([abs-install-dir], - [AS_HELP_STRING([--with-abs-install-dir], - [The absolute path where the j2sdk-image dir will be installed])], - [if test "x${withval}" = x; then - ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image" - else - ABS_JAVA_HOME_DIR="${withval}" - fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"]) -AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) -ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" -ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" -AC_SUBST(ABS_JAVA_HOME_DIR) +ABS_CLIENT_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" +ABS_SERVER_LIBJVM_SO="${prefix}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so" AC_SUBST(ABS_CLIENT_LIBJVM_SO) AC_SUBST(ABS_SERVER_LIBJVM_SO) AC_CONFIG_FILES([tapset/hotspot.stp]) diff -r 548cabd036a9 -r 6749369df844 tapset/hotspot.stp.in --- a/tapset/hotspot.stp.in Fri Apr 01 06:19:20 2016 +0100 +++ b/tapset/hotspot.stp.in Fri Apr 01 06:28:16 2016 +0100 @@ -23,7 +23,7 @@ Currently only works with full path in process probes below. When things don't seem to work look if the correct jre/lib/[arch]/[client|server]/libjvm.so is used - and exists under @ABS_JAVA_HOME_DIR@/. + and exists under @prefix@/. This version of hotspot.stp has been configured to instrument the libjvm.so for arch @INSTALL_ARCH_DIR@ installed at: @ABS_CLIENT_LIBJVM_SO@ diff -r 548cabd036a9 -r 6749369df844 tapset/hotspot_jni.stp.in --- a/tapset/hotspot_jni.stp.in Fri Apr 01 06:19:20 2016 +0100 +++ b/tapset/hotspot_jni.stp.in Fri Apr 01 06:28:16 2016 +0100 @@ -23,7 +23,7 @@ Currently only works with full path in process probes below. When things don't seem to work look if the correct jre/lib/[arch]/[client|server]/libjvm.so is used - and exists under @ABS_JAVA_HOME_DIR@/. + and exists under @prefix@/. This version of hotspot.stp has been configured to instrument the libjvm.so for arch @INSTALL_ARCH_DIR@ installed at: @ABS_CLIENT_LIBJVM_SO@ diff -r 548cabd036a9 -r 6749369df844 tapset/jstack.stp.in --- a/tapset/jstack.stp.in Fri Apr 01 06:19:20 2016 +0100 +++ b/tapset/jstack.stp.in Fri Apr 01 06:28:16 2016 +0100 @@ -34,7 +34,7 @@ Currently only works with full path in process probes below. When things don't seem to work look if the correct jre/lib/[arch]/[client|server]/libjvm.so is used - and exists under @ABS_JAVA_HOME_DIR@/. + and exists under @prefix@/. This version of jstack.stp has been configured to instrument the libjvm.so for arch @INSTALL_ARCH_DIR@ installed at: @ABS_CLIENT_LIBJVM_SO@