From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id IMsQJ76E914wLAAA0tVLHw (envelope-from ) for ; Sat, 27 Jun 2020 17:41:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eOPqIr6E915ydgAA1q6Kng (envelope-from ) for ; Sat, 27 Jun 2020 17:41:18 +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 131C8940308 for ; Sat, 27 Jun 2020 17:41:18 +0000 (UTC) Received: from localhost ([::1]:49988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpEpI-00053b-VV for larch@yhetil.org; Sat, 27 Jun 2020 13:41:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpEp4-00053F-9I for guix-patches@gnu.org; Sat, 27 Jun 2020 13:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpEp3-0002yY-WA for guix-patches@gnu.org; Sat, 27 Jun 2020 13:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jpEp3-0000RV-UC for guix-patches@gnu.org; Sat, 27 Jun 2020 13:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42089] [PATCH 1/1] gnu: icedtea-7: Update to 2.6.22. References: <20200627173600.1368133-1-simon@simonsouth.net> In-Reply-To: <20200627173600.1368133-1-simon@simonsouth.net> Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jun 2020 17:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42089 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42089@debbugs.gnu.org Cc: Simon South Received: via spool by 42089-submit@debbugs.gnu.org id=B42089.15932796331659 (code B ref 42089); Sat, 27 Jun 2020 17:41:01 +0000 Received: (at 42089) by debbugs.gnu.org; 27 Jun 2020 17:40:33 +0000 Received: from localhost ([127.0.0.1]:44554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpEoS-0000QX-6A for submit@debbugs.gnu.org; Sat, 27 Jun 2020 13:40:33 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:49466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jpEoQ-0000QJ-6a for 42089@debbugs.gnu.org; Sat, 27 Jun 2020 13:40:23 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 064C8A2B2E; Sat, 27 Jun 2020 17:40:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m1mphttq3KLa; Sat, 27 Jun 2020 17:40:16 +0000 (UTC) Received: from mars.simonsouth.net (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C60A7A1349; Sat, 27 Jun 2020 17:40:14 +0000 (UTC) From: Simon South Date: Sat, 27 Jun 2020 13:39:57 -0400 Message-Id: <20200627173957.1368283-1-simon@simonsouth.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: 7kSDHlwjZ0Yk * gnu/packages/java.scm (icedtea-7): Update to 2.6.22. [source, native-inputs]: Update URIs. [arguments]<#:configure-flags>: Disable bootstrapping to allow building with previous version of IcedTea. [arguments]<#:phases>: Update "patch-paths", "fix-hotspot-tests" and "fix-jdk-tests" phases to match source code. [home-page]: Update. --- gnu/packages/java.scm | 70 +++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 938b191427..9a2bba4d97 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1163,12 +1163,12 @@ bootstrapping purposes.") (license license:gpl2+))) (define-public icedtea-7 - (let* ((version "2.6.13") + (let* ((version "2.6.22") (drop (lambda (name hash) (origin (method url-fetch) (uri (string-append - "http://icedtea.classpath.org/download/drops" + "http://icedtea.wildebeest.org/download/drops" "/icedtea7/" version "/" name ".tar.bz2")) (sha256 (base32 hash)))))) (package @@ -1181,7 +1181,7 @@ bootstrapping purposes.") version ".tar.xz")) (sha256 (base32 - "1w331rdqx1dcx2xb0fmjmrkdc71xqn20fxsgw8by4xhiblh88khh")) + "1h1kva8n7iaby869p5ni8flsgn8zgsacsz5nwz17wbz7k0w9zyil")) (modules '((guix build utils))) (snippet '(begin @@ -1223,7 +1223,7 @@ bootstrapping purposes.") ;; TODO: package pcsc and sctp, and add to inputs `("--disable-system-pcsc" "--disable-system-sctp" - "--enable-bootstrap" + "--disable-bootstrap" "--enable-nss" "--without-rhino" ,(string-append "--with-parallel-jobs=" @@ -1308,7 +1308,9 @@ bootstrapping purposes.") (string-append "DEVTOOLS_PATH = " corebin)) (("COMPILER_PATH *= */usr/bin/") (string-append "COMPILER_PATH = " - (assoc-ref %build-inputs "gcc") "/bin/")) + (assoc-ref %build-inputs "gcc") "/bin/"))) + + (substitute* "openjdk.src/jdk/make/common/Defs-linux.gmk" (("DEF_OBJCOPY *=.*objcopy") (string-append "DEF_OBJCOPY = " (which "objcopy")))) @@ -1359,16 +1361,7 @@ bootstrapping purposes.") (("ZIPEXE *=.*zip") (string-append "ZIPEXE = " (which "zip"))) (("SED *=.*sed") - (string-append "SED = " (which "sed")))) - - ;; Some of these timestamps cause problems as they are more than - ;; 10 years ago, failing the build process. - (substitute* - "openjdk.src/jdk/src/share/classes/java/util/CurrencyData.properties" - (("AZ=AZM;2005-12-31-20-00-00;AZN") "AZ=AZN") - (("MZ=MZM;2006-06-30-22-00-00;MZN") "MZ=MZN") - (("RO=ROL;2005-06-30-21-00-00;RON") "RO=RON") - (("TR=TRL;2004-12-31-22-00-00;TRY") "TR=TRY"))) + (string-append "SED = " (which "sed"))))) #t)) (add-before 'configure 'set-additional-paths (lambda* (#:key inputs #:allow-other-keys) @@ -1425,8 +1418,7 @@ bootstrapping purposes.") (string-append "PATH=" (getenv "PATH"))) (("make=/usr/bin/make") (string-append "make=" (which "make")))) - (substitute* '("runtime/6626217/Test6626217.sh" - "runtime/7110720/Test7110720.sh") + (substitute* "runtime/7110720/Test7110720.sh" (("/bin/rm") (which "rm")) (("/bin/cp") (which "cp")) (("/bin/mv") (which "mv")))) @@ -1434,6 +1426,11 @@ bootstrapping purposes.") (add-before 'check 'fix-jdk-tests (lambda _ (with-directory-excursion "openjdk.src/jdk/test/" + (substitute* "jprt.config" + (("PATH=\"\\$\\{path4sdk\\}\"") + (string-append "PATH=" (getenv "PATH"))) + (("make=/usr/bin/make") + (string-append "make=" (which "make")))) (substitute* "com/sun/jdi/JdbReadTwiceTest.sh" (("/bin/pwd") (which "pwd"))) (substitute* "com/sun/jdi/ShellScaffold.sh" @@ -1445,18 +1442,29 @@ bootstrapping purposes.") (("/bin/rm") (which "rm"))) (substitute* "tools/launcher/MultipleJRE.sh" (("echo \"#!/bin/sh\"") - (string-append "echo \"#!" (which "rm") "\"")) + (string-append "echo \"#!" (which "sh") "\"")) (("/usr/bin/zip") (which "zip"))) (substitute* "com/sun/jdi/OnThrowTest.java" (("#!/bin/sh") (string-append "#!" (which "sh")))) + (substitute* "java/awt/JAWT/Makefile.unix" + (("ENV *=.*env") (which "env"))) (substitute* "java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java" (("/usr/bin/uptime") (which "uptime"))) (substitute* "java/lang/ProcessBuilder/Basic.java" (("/usr/bin/env") (which "env")) (("/bin/false") (which "false")) (("/bin/true") (which "true")) + (("/bin/echo") (which "echo")) (("/bin/cp") (which "cp")) - (("/bin/sh") (which "sh"))) + (("/bin/sh") (which "sh")) + (("/bin/sleep") (which "sleep")) + (("/bin/bash") (which "bash")) + (("/bin/ps") (which "ps")) + (("/usr/bin/perl") (which "perl")) + (("/usr/bin/xargs") (which "xargs"))) + (substitute* '("java/lang/ProcessBuilder/BigFork.java" + "java/lang/ProcessBuilder/CloseRace.java") + (("/bin/true") (which "true"))) (substitute* "java/lang/ProcessBuilder/FeelingLucky.java" (("/bin/sh") (which "sh"))) (substitute* "java/lang/ProcessBuilder/Zombies.java" @@ -1483,10 +1491,8 @@ bootstrapping purposes.") (("/bin/sh") (which "sh"))) (substitute* "java/lang/Runtime/exec/StreamsSurviveDestroy.java" (("/bin/cat") (which "cat"))) - (substitute* "java/rmi/activation/CommandEnvironment/SetChildEnv.java" - (("/bin/chmod") (which "chmod"))) - (substitute* "java/util/zip/ZipFile/Assortment.java" - (("/bin/sh") (which "sh")))) + (substitute* "java/util/Locale/data/deflocale.sh" + (("/usr/bin/locale") (which "locale")))) #t)) (replace 'check (lambda _ @@ -1630,31 +1636,31 @@ bootstrapping purposes.") (native-inputs `(("openjdk-src" ,(drop "openjdk" - "0l34ikyf62hbzlf9032alzkkqvf7bpmckz4gvirvph755w7gka8l")) + "060qk9kdj2pdl87kp71jng9lkqa98snlc8s0fkrymg714a6kpzk5")) ("corba-drop" ,(drop "corba" - "050gv2jbg1pi6qkn8w18bwpbklfa5b0kymjvan9pncddbj8m84fz")) + "1nw5j576bwhy1s9qli51fv802w86ysm2ldggfyf1kr710dx94ym0")) ("jaxp-drop" ,(drop "jaxp" - "1k6yldwnxfzdg5926r1nlfv8d1r1j7rlp2nkz6gqh05vgyamnfhl")) + "0yjmd2c941qsjj2p5bnn9nlj5rf3a6qjv5pk6whlhpiq4jkyg3lq")) ("jaxws-drop" ,(drop "jaxws" - "110j7jlz47x2gg6f7653x12mssan5kvj9l9h1m1c8c92drfxbqyk")) + "1nipfrahs7h8xb8k593yjq5vh712q6jyzc0ab032ay6gdfw75blc")) ("jdk-drop" ,(drop "jdk" - "0d1mca38ksxvdskp9im3pp7fdijhj1n3lwq9w13r9s4v3qyskgdd")) + "04niz08mfpgcxx4wyqi4b9lyiqnaid12zimjiw078ijf76ka069p")) ("langtools-drop" ,(drop "langtools" - "0nq5236fzxn3p6x8cgncl56mzcmsj07q9gymysnws4c8byc6n0qj")) + "08bhcp1wz0ybjdldfzv0mqvng1yb098kf74lvzv347j5fr57a9cn")) ("hotspot-drop" ,(origin (method url-fetch) (uri (string-append - "http://icedtea.classpath.org/downloads/drops" + "http://icedtea.wildebeest.org/download/drops" "/icedtea7/" version "/hotspot.tar.bz2")) (sha256 (base32 - "17bdv39n4lh8l5737c96f3xgamx4y305m067p01cywgp7zaddqws")) + "0hya1lsw893rwy93gbm1gbqyr7v82bmp722m4x7k303pfr4wbm6s")) (patches (search-patches "icedtea-7-hotspot-aarch64-use-c++98.patch")))) ("ant" ,ant-bootstrap) @@ -1696,7 +1702,7 @@ bootstrapping purposes.") ("lcms" ,lcms) ("zlib" ,zlib) ("gtk" ,gtk+-2))) - (home-page "http://icedtea.classpath.org") + (home-page "https://icedtea.classpath.org/wiki/Main_Page") (synopsis "Java development kit") (description "This package provides the Java development kit OpenJDK built with the -- 2.26.2