Received: by mail.netbsd.org (Postfix, from userid 605) id 8417C84E55; Sun, 27 May 2018 04:58:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A7AAB84E4B for ; Sun, 27 May 2018 04:58:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id l9-BYlutYk3x for ; Sun, 27 May 2018 04:58:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0ADA484CD0 for ; Sun, 27 May 2018 04:58:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EB649FBEC; Sun, 27 May 2018 04:58:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1527397100295800" MIME-Version: 1.0 Date: Sun, 27 May 2018 04:58:20 +0000 From: "Izumi Tsutsui" Subject: CVS commit: pkgsrc/lang/openjdk8 To: pkgsrc-changes@NetBSD.org Reply-To: tsutsui@netbsd.org X-Mailer: log_accum Message-Id: <20180527045820.EB649FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1527397100295800 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tsutsui Date: Sun May 27 04:58:20 UTC 2018 Modified Files: pkgsrc/lang/openjdk8: distinfo pkgsrc/lang/openjdk8/patches: patch-common_autoconf_generated-configure.sh Log Message: openjdk8: use grep to get BOOT_JDK_VERSION in all possible places. The bootstrap binaries might contain text relocations and using 'head -n 1' could fail due to warning messages from ld.elf_so. Fixes PR pkg/53223. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 pkgsrc/lang/openjdk8/distinfo cvs rdiff -u -r1.13 -r1.14 \ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1527397100295800 Content-Disposition: inline Content-Length: 14669 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/openjdk8/distinfo diff -u pkgsrc/lang/openjdk8/distinfo:1.55 pkgsrc/lang/openjdk8/distinfo:1.56 --- pkgsrc/lang/openjdk8/distinfo:1.55 Sat May 26 21:26:46 2018 +++ pkgsrc/lang/openjdk8/distinfo Sun May 27 04:58:20 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.55 2018/05/26 21:26:46 ryoon Exp $ +$NetBSD: distinfo,v 1.56 2018/05/27 04:58:20 tsutsui 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-bh) = 6194a7c319a496f8ff7df1 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55 -SHA1 (patch-common_autoconf_generated-configure.sh) = becb70acee2cfaa5f8bab588ece118303fe1f123 +SHA1 (patch-common_autoconf_generated-configure.sh) = 71ceb540d46c9acd43b54c7d73c93e5b0a03f939 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = a686ca478011561df93cce6311b5a344d79c3a24 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 Index: pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh diff -u pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.13 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.14 --- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.13 Tue Nov 28 05:07:25 2017 +++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh Sun May 27 04:58:20 2018 @@ -1,8 +1,9 @@ -$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.13 2017/11/28 05:07:25 ryoon Exp $ +$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.14 2018/05/27 04:58:20 tsutsui Exp $ -BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) +BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and +pkg/53223. ---- common/autoconf/generated-configure.sh.orig 2017-11-28 00:13:34.000000000 +0000 +--- common/autoconf/generated-configure.sh.orig 2018-02-12 08:30:01.000000000 +0000 +++ common/autoconf/generated-configure.sh @@ -8486,9 +8486,9 @@ done # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. @@ -17,6 +18,15 @@ BOOT_JDK_VERSION part: pkg/51221 (Build MAKE_CANDIDATE=""$MAKE"" DESCRIPTION="user supplied MAKE=$MAKE" +@@ -11455,7 +11455,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` @@ -11787,7 +11787,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else @@ -26,6 +36,24 @@ BOOT_JDK_VERSION part: pkg/51221 (Build # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -12105,7 +12105,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -12293,7 +12293,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` @@ -12571,7 +12571,7 @@ fi # Resolve file symlinks while test $COUNTER -lt 20; do @@ -35,6 +63,168 @@ BOOT_JDK_VERSION part: pkg/51221 (Build # This is not a symbolic link! We are done! break fi +@@ -12621,7 +12621,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -12836,7 +12836,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -13016,7 +13016,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -13224,7 +13224,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -13404,7 +13404,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -13612,7 +13612,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -13792,7 +13792,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -14000,7 +14000,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -14180,7 +14180,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -14375,7 +14375,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -14553,7 +14553,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -14749,7 +14749,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -14927,7 +14927,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -15122,7 +15122,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -15300,7 +15300,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -15496,7 +15496,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -15674,7 +15674,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` +@@ -15851,7 +15851,7 @@ $as_echo "$as_me: Potential Boot JDK fou + BOOT_JDK_FOUND=no + else + # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? +- BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` ++ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version` + + # Extra M4 quote needed to protect [] in grep expression. + FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` @@ -16257,16 +16257,15 @@ $as_echo_n "checking flags for boot jdk # Maximum amount of heap memory. # Maximum stack size. --_----------=_1527397100295800--