From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5AB1259CAF for ; Sun, 10 Apr 2016 22:10:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFE7921C024; Sun, 10 Apr 2016 22:10:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6730821C024 for ; Sun, 10 Apr 2016 22:10:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3578B3405CF for ; Sun, 10 Apr 2016 22:10:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8A1220E for ; Sun, 10 Apr 2016 22:10:03 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1460326181.e93177f868da4b4b692d7d85ee9fde67003f5731.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/files/, dev-java/icedtea/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/icedtea/files/8-ccache.patch dev-java/icedtea/icedtea-3.0.0.ebuild X-VCS-Directories: dev-java/icedtea/files/ dev-java/icedtea/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: e93177f868da4b4b692d7d85ee9fde67003f5731 X-VCS-Branch: master Date: Sun, 10 Apr 2016 22:10:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 800a78f6-ea95-452c-bf9e-3417f67b0a6a X-Archives-Hash: 6327d9ade54fbed6349c68c8ce37616a commit: e93177f868da4b4b692d7d85ee9fde67003f5731 Author: James Le Cuirot gentoo org> AuthorDate: Sun Apr 10 22:09:41 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Apr 10 22:09:41 2016 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=e93177f8 dev-java/icedtea: ccache - fix version check, strip PATH, no automagic Package-Manager: portage-2.2.28 dev-java/icedtea/files/8-ccache.patch | 11 +++++++++++ dev-java/icedtea/icedtea-3.0.0.ebuild | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dev-java/icedtea/files/8-ccache.patch b/dev-java/icedtea/files/8-ccache.patch new file mode 100644 index 0000000..c846dba --- /dev/null +++ b/dev-java/icedtea/files/8-ccache.patch @@ -0,0 +1,11 @@ +--- openjdk/common/autoconf/generated-configure.sh.orig 2016-04-01 04:32:19.000000000 +0100 ++++ openjdk/common/autoconf/generated-configure.sh 2016-04-10 20:04:53.472885447 +0100 +@@ -35764,7 +35764,7 @@ + # precompiled headers. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5 + $as_echo_n "checking if ccache supports precompiled headers... " >&6; } +- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null` ++ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null` + if test "x$HAS_GOOD_CCACHE" = x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 + $as_echo "no, disabling ccache" >&6; } diff --git a/dev-java/icedtea/icedtea-3.0.0.ebuild b/dev-java/icedtea/icedtea-3.0.0.ebuild index f36fe40..a17c4ab 100644 --- a/dev-java/icedtea/icedtea-3.0.0.ebuild +++ b/dev-java/icedtea/icedtea-3.0.0.ebuild @@ -270,6 +270,18 @@ src_configure() { zero_config="--enable-zero" fi + # https://bugs.openjdk.java.net/browse/JDK-8067132 + export DISTRIBUTION_PATCHES="${SLOT}-ccache.patch" + ln -snf "${FILESDIR}"/${SLOT}-ccache.patch . || die + + # IcedTea itself doesn't handle ccache yet. + if has ccache ${FEATURES}; then + ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.' + export enable_ccache=yes + else + export enable_ccache=no + fi + config+=" --with-parallel-jobs=$(makeopts_jobs)" unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS @@ -304,7 +316,9 @@ src_configure() { } src_compile() { - emake + # OpenJDK is quite picky about ccache and dies if you attempt to use + # it via wrapper symlinks like Gentoo normally does. + PATH=$(sed 's#[^:]*/ccache/bin:##g' <<< "${PATH}") emake } src_test() {