From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cIKEKTmefmDYRwEAgWs5BA (envelope-from ) for ; Tue, 20 Apr 2021 11:26:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MCw9JTmefmAWVQAA1q6Kng (envelope-from ) for ; Tue, 20 Apr 2021 09:26:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C4C55197A3 for ; Tue, 20 Apr 2021 11:26:16 +0200 (CEST) Received: from localhost ([::1]:40224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYme6-0003hi-NP for larch@yhetil.org; Tue, 20 Apr 2021 05:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYmdu-0003ge-8B for bug-guix@gnu.org; Tue, 20 Apr 2021 05:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYmdt-0003bi-TD for bug-guix@gnu.org; Tue, 20 Apr 2021 05:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYmdt-0005E7-P7 for bug-guix@gnu.org; Tue, 20 Apr 2021 05:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#31719: icedtea-3 binaries contain references to icedtea-2 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 20 Apr 2021 09:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31719 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Andreas Enge Received: via spool by 31719-submit@debbugs.gnu.org id=B31719.161891071020029 (code B ref 31719); Tue, 20 Apr 2021 09:26:01 +0000 Received: (at 31719) by debbugs.gnu.org; 20 Apr 2021 09:25:10 +0000 Received: from localhost ([127.0.0.1]:52952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYmd4-0005Cz-2H for submit@debbugs.gnu.org; Tue, 20 Apr 2021 05:25:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYmd2-0005Cj-D6 for 31719@debbugs.gnu.org; Tue, 20 Apr 2021 05:25:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59339) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYmcv-00032a-WE; Tue, 20 Apr 2021 05:25:02 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48532 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lYmcv-0002ow-6F; Tue, 20 Apr 2021 05:25:01 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87o8g2pni4.fsf@gnu.org> <20210301231534.1d4e440a@alma-ubu.fritz.box> <878s5ltj0o.fsf@elephly.net> <20210416212233.05ac87de@alma-ubu.fritz.box> <87fszpc1du.fsf@zancanaro.id.au> <87czutbd2f.fsf@zancanaro.id.au> <87a6pxb69o.fsf@zancanaro.id.au> <87wnsym944.fsf@elephly.net> Date: Tue, 20 Apr 2021 11:24:59 +0200 In-Reply-To: (Andreas Enge's message of "Tue, 20 Apr 2021 10:34:17 +0200") Message-ID: <878s5de2ac.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ricardo Wurmus , 31719@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618910777; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=4ugBI2bOW7MWHpP0NYo+kyrWIOlZRxD2Zx2PtXheCxY=; b=rdInha9xqlAfwZe/55T0t/HIxhp9Q6wEidleTxbUZmroaITzz1yIj3QI8xNxcp+xU4aCOF +Ipl8nOTEq9peO1mTNP4wIKYkmTHGVxUxNPOnSFi+Sq8iAZvGCxXxVtSQsoyJMAyOn4Ird ebIzYC9lLSz4zwrspHkyNgdrYT58qC9oJvjbuIkHu2pDXDtoZ0uYrM88M1ihzb3T+8/6dG 3VNmp9Z0i2i36M7Gnr/euCc9s5SbcAm4D66d9qcrG/FdAcpfkw+kBoE60qVY2ovm+XK+rA Z9NIKOTv3Vf/4WgZqRpKnsZvbxqOzUn9oNvTIAzzb2ZNoGax1UCXkEAE2gmAdQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618910777; a=rsa-sha256; cv=none; b=sZs+H4DCqOVCXA2LGVrJ+6XP7MNhr4+4bWNLTafnnO4vLQ7WkchWGGx/jVr7oIl54ZkB+2 xsMdXJ1P/tLT3J2Mf0gO719AQkBjMQj57pEAiBliSGkkXzUTrozNOW+Dn+g//lFD33tN7F njKU5kVM/C3eOcpvSeMWzCEUKsBLUUregoILXjEwj8SgB2TLGmzlgtzp+ruw6DUZw2WYJn Or5F4/T9I/PwaVLSQNwGsOua0mBXi+t76lPPYCOmmgjnyeysaDtTokmvMNt6DacsKZ0Xg+ ButjztVBOZZ6oXl5NW4XsAD8MudD/UUzxvj9XaF49eUkPfKsGzlmjxXMMixx1g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -2.94 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: C4C55197A3 X-Spam-Score: -2.94 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3X/mOxu2M6ex --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Andreas Enge skribis: > Am Mon, Apr 19, 2021 at 08:18:03PM +0200 schrieb Ricardo Wurmus: >> I just looked over the patch, and while I=E2=80=99m not sure it=E2=80=99= s the best way to do >> things (matching =E2=80=9Copenjdk=E2=80=9D or =E2=80=9Cicedtea=E2=80=9D = in the package name seems a little >> error prone in the presence of packages whose names might include these >> strings), but I think it=E2=80=99s a definite improvement. > > I just pushed the patch to master. Thanks a lot, Carlo! It has definitely > solved my problem: I can now compile an Android project after downloading > a single openjdk package. > > It would be nice if someone else could close the bug if you feel the prob= lem > is solved, or otherwise leave it open to discuss further possible improve= ments. I think we can close it. I have the attached improvements that I can commit to =E2=80=98staging=E2=80=99 (or =E2=80=98core-updates=E2=80=99?) to= avoid another rebuild. Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-java-fixlet.patch Content-Description: the patch >From 253d0485a9307c4e08afc058d7dafcd56025f9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 20 Apr 2021 00:26:01 +0200 Subject: [PATCH] java fixlet --- gnu/packages/java.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3c4013ab6f..b780f7a85f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1749,6 +1749,9 @@ IcedTea build harness.") ((guix build ant-build-system) (guix build syscalls) ,@%gnu-build-system-modules) + + #:disallowed-references ((,icedtea-7 "jdk")) + ,@(substitute-keyword-arguments (package-arguments icedtea-7) ((#:modules modules) `((guix build utils) @@ -1792,10 +1795,13 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (use-modules (srfi srfi-1)) + (define remove + (@ (srfi srfi-1) remove)) + (define (icedtea-or-openjdk? path) (or (string-contains path "openjdk") (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? (search-path-as-string->list (getenv "LIBRARY_PATH")))) @@ -1898,6 +1904,9 @@ new Date();")) #:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) + + #:disallowed-references (,icedtea-8 (,icedtea-8 "jdk")) + #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'fix-java-shebangs @@ -1936,18 +1945,20 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (use-modules (srfi srfi-1)) + (define remove + (@ (srfi srfi-1) remove)) + (define (icedtea-or-openjdk? path) (or (string-contains path "openjdk") (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? (search-path-as-string->list (getenv "LIBRARY_PATH")))) (find-library (lambda (name) - (or (search-path - library-path - (string-append "lib" name ".so")) - (string-append "lib" name ".so"))))) + (search-path + library-path + (string-append "lib" name ".so"))))) (for-each (lambda (file) (catch 'decoding-error @@ -2090,7 +2101,9 @@ new Date();")) "--with-libjpeg=system" "--with-native-debug-symbols=zipped" (string-append "--prefix=" (assoc-ref outputs "out"))) - #t)))))) + #t)))) + ((#:disallowed-references _ '()) + `(,openjdk9 (,openjdk9 "jdk"))))) (native-inputs `(("openjdk9" ,openjdk9) ("openjdk9:jdk" ,openjdk9 "jdk") @@ -2120,6 +2133,9 @@ new Date();")) (arguments `(#:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) + + #:disallowed-references (,openjdk10 (,openjdk10 "jdk")) + #:tests? #f; requires jtreg ;; TODO package jtreg #:configure-flags @@ -2150,10 +2166,13 @@ new Date();")) (add-after 'unpack 'patch-jni-libs ;; Hardcode dynamically loaded libraries. (lambda _ - (use-modules (srfi srfi-1)) + (define remove + (@ (srfi srfi-1) remove)) + (define (icedtea-or-openjdk? path) (or (string-contains path "openjdk") (string-contains path "icedtea"))) + (let* ((library-path (remove icedtea-or-openjdk? (search-path-as-string->list (getenv "LIBRARY_PATH")))) -- 2.31.1 --=-=-=--