[pkgsrc/trunk]: pkgsrc/lang/openjdk8 Fix zlib detection. Use correct strip f...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/openjdk8 Fix zlib detection. Use correct strip f...
From: jperkin <jperkin%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 05:40:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/24584d754b90
branches:  trunk
changeset: 349930:24584d754b90
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jul 19 12:32:15 2016 +0000

description:
Fix zlib detection.  Use correct strip flag on SunOS.

diffstat:

 lang/openjdk8/Makefile                                             |   8 ++-
 lang/openjdk8/distinfo                                             |   8 +-
 lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh |  23 +++++----
 lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk          |  20 ++++++++-
 lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk         |   6 +-
 5 files changed, 44 insertions(+), 21 deletions(-)

diffs (217 lines):

diff -r 1c92f60a0513 -r 24584d754b90 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Tue Jul 19 12:02:46 2016 +0000
+++ b/lang/openjdk8/Makefile    Tue Jul 19 12:32:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2016/07/05 14:32:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.38 2016/07/19 12:32:15 jperkin Exp $
 
 DISTNAME=      openjdk-1.8.92-20160506
 PKGNAME=       openjdk8-1.8.92
@@ -48,7 +48,6 @@
 CONFIGURE_ARGS+=       --host=${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=       --with-boot-jdk=${ALT_BOOTDIR}
 CONFIGURE_ARGS+=       --with-zlib=system
-MAKEFLAGS+=            LIBZ="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz"
 CONFIGURE_ARGS+=       --with-giflib=bundled
 CONFIGURE_ARGS+=       --with-cups=${BUILDLINK_PREFIX.cups}
 CONFIGURE_ARGS+=       --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib
@@ -144,6 +143,11 @@
 SUBST_SED.fontpaths=           -e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.fontpaths+=          -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
 
+SUBST_CLASSES+=                        zlibpath
+SUBST_STAGE.zlibpath=          pre-build
+SUBST_FILES.zlibpath=          jdk/make/CompileLaunchers.gmk jdk/make/lib/CoreLibraries.gmk
+SUBST_VARS.zlibpath=           COMPILER_RPATH_FLAG BUILDLINK_PREFIX.zlib
+
 PLIST_VARS+=   i386
 .if ${MACHINE_ARCH} == "i386"
 PLIST.i386=    yes
diff -r 1c92f60a0513 -r 24584d754b90 lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Tue Jul 19 12:02:46 2016 +0000
+++ b/lang/openjdk8/distinfo    Tue Jul 19 12:32:15 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2016/07/05 14:32:21 jperkin Exp $
+$NetBSD: distinfo,v 1.39 2016/07/19 12:32:15 jperkin Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -59,7 +59,7 @@
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
-SHA1 (patch-common_autoconf_generated-configure.sh) = 297cdc5c593624051d45f5523b8d47a10facfde0
+SHA1 (patch-common_autoconf_generated-configure.sh) = 16da232d94af0c4f5d9babd694321511636985dc
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = a890e1da1c6bbdf271c97b7241e50cedac3acdf9
@@ -100,12 +100,12 @@
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
 SHA1 (patch-hotspot_test_compiler_native_TestDirtyInt.sh) = a24016e3594b49db232388974d40e8f4d411edcd
 SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
-SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 30a2dc0b7f211c47b1b831691d310865a5839851
+SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
 SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
 SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac
-SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 839197feea5ccc9ede70c2c454199fa5ca00c500
+SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 15ed4c5d01b50ab63447a19883925ac975d8390f
 SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
 SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
 SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
diff -r 1c92f60a0513 -r 24584d754b90 lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh        Tue Jul 19 12:02:46 2016 +0000
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh        Tue Jul 19 12:32:15 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.9 2016/05/06 13:37:01 ryoon Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.10 2016/07/19 12:32:15 jperkin Exp $
 
 --- common/autoconf/generated-configure.sh.orig        2016-05-06 12:11:21.000000000 +0000
 +++ common/autoconf/generated-configure.sh
@@ -24,7 +24,7 @@
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk 
+@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk
    # Maximum amount of heap memory.
    # Maximum stack size.
    if test "x$BOOT_JDK_BITS" = x32; then
@@ -105,7 +105,7 @@
      # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
      COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
      $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-@@ -29390,6 +29389,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -29390,6 +29389,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
      if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
        SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
      fi
@@ -116,11 +116,12 @@
 +      SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
 +      CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
 +      CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
++      POST_STRIP_CMD="$STRIP -x"
 +    fi
    else
      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
        # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
-@@ -29531,6 +29538,13 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -29531,6 +29539,13 @@ rm -f core conftest.err conftest.$ac_obj
                C_O_FLAG_NORM="-Os"
                C_O_FLAG_NONE=""
                ;;
@@ -134,7 +135,7 @@
              *)
                C_O_FLAG_HI="-O3"
                C_O_FLAG_NORM="-O2"
-@@ -29732,7 +29746,7 @@ fi
+@@ -29732,7 +29747,7 @@ fi
    #
    case $COMPILER_NAME in
      gcc )
@@ -143,7 +144,7 @@
        -pipe \
        -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
        case $OPENJDK_TARGET_CPU_ARCH in
-@@ -30343,7 +30357,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -30343,7 +30358,8 @@ $as_echo "alsa pulse x11" >&6; }
    if test "x$OPENJDK_TARGET_OS" = xbsd; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
  $as_echo_n "checking what is not needed on BSD?... " >&6; }
@@ -153,7 +154,7 @@
        ALSA_NOT_NEEDED=yes
        PULSE_NOT_NEEDED=yes
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -31555,7 +31570,11 @@ $as_echo "$as_me: WARNING: freetype not 
+@@ -31555,7 +31571,11 @@ $as_echo "$as_me: WARNING: freetype not
  
        # Allow --with-freetype-lib and --with-freetype-include to override
        if test "x$with_freetype_include" != x; then
@@ -166,7 +167,7 @@
        fi
        if test "x$with_freetype_lib" != x; then
          POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -34373,7 +34392,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -34373,7 +34393,7 @@ $as_echo "$as_me: The path of FREETYPE_I
      FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
    fi
  
@@ -175,7 +176,7 @@
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
        else
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -34506,7 +34525,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -34506,7 +34526,7 @@ $as_echo "$as_me: The path of FREETYPE_L
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
          FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
        else
@@ -184,7 +185,7 @@
        fi
      fi
  
-@@ -35732,9 +35751,6 @@ fi
+@@ -35732,9 +35752,6 @@ fi
  
  
  
@@ -194,7 +195,7 @@
  
      llvm_components="jit mcjit engine nativecodegen native"
      unset LLVM_CFLAGS
-@@ -35777,7 +35793,7 @@ fi
+@@ -35777,7 +35794,7 @@ fi
    fi
  
    # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
diff -r 1c92f60a0513 -r 24584d754b90 lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk
--- a/lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk Tue Jul 19 12:02:46 2016 +0000
+++ b/lang/openjdk8/patches/patch-jdk_make_CompileLaunchers.gmk Tue Jul 19 12:32:15 2016 +0000
@@ -1,7 +1,25 @@
-$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.3 2016/05/06 13:37:01 ryoon Exp $
+$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.4 2016/07/19 12:32:15 jperkin Exp $
 
 --- jdk/make/CompileLaunchers.gmk.orig 2016-05-06 12:11:21.000000000 +0000
 +++ jdk/make/CompileLaunchers.gmk
+@@ -121,7 +121,7 @@ define SetupLauncher
+   endif
+ 
+   ifeq ($(USE_EXTERNAL_LIBZ), true)
+-    $1_LDFLAGS_SUFFIX += -lz
++    $1_LDFLAGS_SUFFIX += @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
+   endif
+ 
+   $1_OUTPUT_DIR_ARG := $9
+@@ -441,7 +441,7 @@ endif
+ # binary (at least on linux) which causes the size to differ between old and new build.
+ ifeq ($(USE_EXTERNAL_LIBZ), true)
+   UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
+-  UNPACKEXE_ZIPOBJS := -lz
++  UNPACKEXE_ZIPOBJS := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
+ else
+   UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
+   UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
 @@ -548,9 +548,7 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/
  # jdk/make/java/Makefile
  #
diff -r 1c92f60a0513 -r 24584d754b90 lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
--- a/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk        Tue Jul 19 12:02:46 2016 +0000
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk        Tue Jul 19 12:32:15 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.1 2016/07/05 14:32:21 jperkin Exp $
+$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.2 2016/07/19 12:32:15 jperkin Exp $
 
-Allow passing LIBZ in the environment.
+Ensure we can find zlib.
 
 --- jdk/make/lib/CoreLibraries.gmk.orig        2016-05-06 12:11:21.000000000 +0000
 +++ jdk/make/lib/CoreLibraries.gmk
@@ -9,7 +9,7 @@
  BUILD_LIBZIP_EXCLUDES :=
  ifeq ($(USE_EXTERNAL_LIBZ), true)
 -  LIBZ := -lz
-+  #LIBZ := -lz
++  LIBZ := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
    LIBZIP_EXCLUDES += zlib-1.2.8
  else
    ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
Prev by Date: [pkgsrc/trunk]: pkgsrc/www/typo3_62 Update typo3_62 package to 6.2.26 (TYPO3 ...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of www/typo3_62 package to 6.2.26.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/typo3_62 Update typo3_62 package to 6.2.26 (TYPO3 ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of www/typo3_62 package to 6.2.26.
Indexes:
Home | Main Index | Thread Index | Old Index