From patchwork Thu Nov 9 19:13:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 56157 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6DBD727BBE9; Thu, 9 Nov 2023 19:15:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 059BA27BBE2 for ; Thu, 9 Nov 2023 19:15:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1AU8-0003yh-GC; Thu, 09 Nov 2023 14:14:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1ATv-0003rF-I5 for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1ATu-0002Ch-NX for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1AUX-0005p1-Lf for guix-patches@gnu.org; Thu, 09 Nov 2023 14:15:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67026] [PATCH 1/3] gnu: javacc: Do not reference a jdk. References: <20231109195755.67182db2@lepiller.eu> In-Reply-To: <20231109195755.67182db2@lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 19:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67026@debbugs.gnu.org Received: via spool by 67026-submit@debbugs.gnu.org id=B67026.169955724322279 (code B ref 67026); Thu, 09 Nov 2023 19:15:01 +0000 Received: (at 67026) by debbugs.gnu.org; 9 Nov 2023 19:14:03 +0000 Received: from localhost ([127.0.0.1]:48754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATa-0005nA-Qh for submit@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:03 -0500 Received: from lepiller.eu ([89.234.186.109]:47832 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATX-0005mY-7d for 67026@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:01 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 9b4227b0 for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=F7xk2bXyiuWelmltKc9D7m1xw cqdIWPf2xBifRWyklI=; b=j9V8SzvAQDzIFoyUGIWXzLEMjL/0nVirbghdcravZ cKf+T/dCGEFk7MAZSl1SzkKx4L0HR0xYrgJPjWW7vVYDtMLFxrUlnF0GZ5iWIi5o S6TvEOThf1hzWezglHuM6wYZ7+CVMbh2fXAvinxNDLlF22LKGxXB7WXAriDc3rG9 ZNet1c2/sWcgHl5vGW0XfOEo9/V+xp5kiNk7vEfDHegQXTilN0RQAHfC/Q/K3X3V cdLcndU2IcVdof4hQxFPu6O/ik1zi7E9Y3pBADMLQZ38UJf6iiHQ7LCXzhFO/6Ee AsbBf+ka17gXOAbdQ9io/SKHY1W3+m6j7q1mj4HPD3ooA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 74ea1af7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:16 +0000 (UTC) From: Julien Lepiller Date: Thu, 9 Nov 2023 20:13:07 +0100 Message-ID: <20231109191309.6876-1-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The jdk provides java and javac, while a jre only provides the necessary java, reducing the closure size by 350MB. * gnu/packages/java.scm (javacc): Remove #t at end of phases. [inputs]: Add icedtea-8 as the jre. [arguments]: Use it instead of the jdk. Change-Id: Icb218c40915550b7ff1db96a48a3c48fa6ef52b4 --- gnu/packages/java.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7c8c4e0a36..eded386a03 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2465,8 +2465,7 @@ (define-public javacc (modules '((guix build utils))) ;; Delete bundled jars. (snippet '(begin (for-each delete-file-recursively - '("bootstrap" "lib")) - #t)))) + '("bootstrap" "lib")))))) (arguments `(#:make-flags ; bootstrap from javacc-4 ,#~(list (string-append "-Dbootstrap-jar=" @@ -2487,17 +2486,16 @@ (define-public javacc (lambda _ (display (string-append "#!/bin/sh\n" - (assoc-ref inputs "jdk") "/bin/java" + (assoc-ref inputs "icedtea") "/bin/java" " -cp " dir "/javacc.jar" " `basename $0`" " $*")))) (chmod javacc #o755) ;; symlink to different names to affect the first argument and ;; change the behavior of the jar file. (symlink javacc (string-append bin "/jjdoc")) - (symlink javacc (string-append bin "/jjtree")) - #t)))))) - + (symlink javacc (string-append bin "/jjtree")))))))) (native-inputs - (list javacc-4)))) + (list javacc-4)) + (inputs (list icedtea-8)))) (define-public java-ecj (package From patchwork Thu Nov 9 19:13:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 56156 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0296427BBEA; Thu, 9 Nov 2023 19:15:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C3E6527BBE9 for ; Thu, 9 Nov 2023 19:15:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1AUD-000417-KP; Thu, 09 Nov 2023 14:14:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1ATv-0003rG-Of for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:28 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1ATv-0002Cm-A4 for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1AUY-0005pK-IV for guix-patches@gnu.org; Thu, 09 Nov 2023 14:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67026] [PATCH 2/3] gnu: java-openjfx-graphics: Make java-swt optional. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 19:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67026@debbugs.gnu.org Received: via spool by 67026-submit@debbugs.gnu.org id=B67026.169955724822303 (code B ref 67026); Thu, 09 Nov 2023 19:15:02 +0000 Received: (at 67026) by debbugs.gnu.org; 9 Nov 2023 19:14:08 +0000 Received: from localhost ([127.0.0.1]:48758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATg-0005ne-IP for submit@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:08 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:42472 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATY-0005mb-Oi for 67026@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:04 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 2361c6ab for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=kxZwUG/cxqj2gm3aLWQnZDfJr bDxKNmzAAwuwMhNtEA=; b=WapV8Knce1jMztdVR4U8S6TBRBx9y6T036DNRnCTC hN5y5IpxrLU3aaZR5Ki/I/oquli2espo2THyhoCOngU6O0eDNEOOCqu6GIytEa3y ikiG9qAkchIjVBfQqz4d4rQK5EwbgMZB4nVs2Updt0jzo58L+JbM4Sza8vfKPPRJ K34xTgOqAhmxu+9BwUbe0KYcYN/f4dV9huUu9ySJUhA7mInuWABtFBxxDYVGe6ej 3ou2CDxy2buP5mnfOKcqpRc/94wAm1SZHdR7Hh6rTkDYLvvQInFK8BvgDTmrok3A ogfY5u9wFXcJjzMHAFqwNGRx904dxcWNj4PTprmCySSLA== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id b7e57fdc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:16 +0000 (UTC) From: Julien Lepiller Date: Thu, 9 Nov 2023 20:13:08 +0100 Message-ID: <20231109191309.6876-2-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231109191309.6876-1-julien@lepiller.eu> References: <20231109191309.6876-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches It is used for an optional part of openjfx and not used by current packages in Guix. Swt has a reference to a library in the JDK and has a huge closure size because of that. This reduces closure by 1GB for this package and dependents (including josm). * gnu/packages/java.scm (java-openjfx-graphics)[native-inputs]: Move java-swt... [inputs]: ...to here. Change-Id: I7d8cb14569d5a9f451944695225a2dff143bf190 --- gnu/packages/java.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index eded386a03..d73550c042 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2311,7 +2311,9 @@ (define-public java-openjfx-graphics (string-append target new-name)))) (find-files "netbeans" "\\.so$")))))))) (propagated-inputs - (list java-openjfx-base java-swt)) + (list java-openjfx-base)) + (inputs + (list java-swt)) ;; XXX: for unknown reasons ;; modules/graphics/src/main/native-prism-sw/JNativeSurface.c is missing ;; in this revision. From patchwork Thu Nov 9 19:13:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 56155 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 12FBF27BBE9; Thu, 9 Nov 2023 19:14:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 156F027BBE2 for ; Thu, 9 Nov 2023 19:14:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1AUC-00040Q-7Z; Thu, 09 Nov 2023 14:14:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1ATv-0003rE-I5 for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:28 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1ATv-0002Ck-5r for guix-patches@gnu.org; Thu, 09 Nov 2023 14:14:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1AUY-0005pC-4b for guix-patches@gnu.org; Thu, 09 Nov 2023 14:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67026] [PATCH 3/3] gnu: josm: Reduce closure size. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 19:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67026@debbugs.gnu.org Received: via spool by 67026-submit@debbugs.gnu.org id=B67026.169955724522293 (code B ref 67026); Thu, 09 Nov 2023 19:15:02 +0000 Received: (at 67026) by debbugs.gnu.org; 9 Nov 2023 19:14:05 +0000 Received: from localhost ([127.0.0.1]:48756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATd-0005nU-AQ for submit@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:05 -0500 Received: from lepiller.eu ([89.234.186.109]:47832 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1ATa-0005mY-3P for 67026@debbugs.gnu.org; Thu, 09 Nov 2023 14:14:02 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id 2e28ed03 for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=+EAmRYDG3vpJGXMJ0Z3vOClCO wWVl6g8LjE/zlir+TY=; b=Hcws3uyhAPkb4ye5c1bBNDdeK6L9eu1If9YNoX7lL X4IBlyoz/sNU7XBaQWTI98tDgAiwoEGWcok6rpEJTUYt7rrTIhaMcrorirdSsUTv ApGDrnGbLkBu7vq2JbhTTD3OZiSjt/LpM0+EJkqO1fF1F9JegTRfo5MCCz0rc2xZ VbEKBtlFN2M9re5K+mlqBEHiNczVh7lZrdCU2LC1jGN+i7itVNiGrPtCKB2OVVl1 DyIQFnqw7tub7k6vmhNA7EBjOrS77FlyOueWLmWvQWqLTMY+WPPVyTyBJyJTDFt0 yNG6r6xANmSiTSaFRg7ai/4WVMbpPxtsDFGFQznWK0wRg== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 713882dc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <67026@debbugs.gnu.org>; Thu, 9 Nov 2023 19:13:16 +0000 (UTC) From: Julien Lepiller Date: Thu, 9 Nov 2023 20:13:09 +0100 Message-ID: <20231109191309.6876-3-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231109191309.6876-1-julien@lepiller.eu> References: <20231109191309.6876-1-julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This saves 240MB of closure size. * gnu/packages/geo.scm (josm)[inputs]: Add openjdk11. [arguments]: Filter native inputs out of CLASSPATH. Use `java' from openjdk11 instead of the JDK. Change-Id: Ifa03b5cd033c5866d22e7557119284be0ea25a0e --- gnu/packages/geo.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index dbc8440141..746b22a082 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1970,7 +1970,8 @@ (define-public josm java-openjfx-media java-parsson ; runtime dependency java-signpost-core - java-svg-salamander)) + java-svg-salamander + openjdk11)) (arguments `(#:tests? #f #:jar-name "josm.jar" @@ -2070,9 +2071,16 @@ (define-public josm (lambda _ (display (string-append "#!/bin/sh\n" - (assoc-ref inputs "jdk") "/bin/java" + (assoc-ref inputs "openjdk") "/bin/java" " -cp " out "/share/java/josm.jar:" - (getenv "CLASSPATH") + ;; CLASSPATH, but remove native inputs + (string-join + (filter + (lambda (jar) + (and (not (string-contains jar "-jdk/")) + (not (string-contains jar "-javacc-")))) + (string-split (getenv "CLASSPATH") #\:)) + ":") " org.openstreetmap.josm.gui.MainApplication")))) (chmod (string-append bin "/josm") #o755)) #t)))))