From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id L7i/FTVRMWFIHQEAgWs5BA (envelope-from ) for ; Fri, 03 Sep 2021 00:33:25 +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 UG69EDVRMWGYXwAA1q6Kng (envelope-from ) for ; Thu, 02 Sep 2021 22:33:25 +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 AB0CB104F6 for ; Fri, 3 Sep 2021 00:33:24 +0200 (CEST) Received: from localhost ([::1]:60150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLvGt-0002xW-2r for larch@yhetil.org; Thu, 02 Sep 2021 18:33:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLvGY-0002vr-GL for bug-guix@gnu.org; Thu, 02 Sep 2021 18:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58979) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLvGY-0004Cz-7y for bug-guix@gnu.org; Thu, 02 Sep 2021 18:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLvGX-0001WU-Vi for bug-guix@gnu.org; Thu, 02 Sep 2021 18:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#49990: [PATCH] gnu: Fix classpath-bootstrap compilation References: <20210810233801.02639bd8@tachikoma.lepiller.eu> In-Reply-To: <20210810233801.02639bd8@tachikoma.lepiller.eu> Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 02 Sep 2021 22:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49990 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 49990@debbugs.gnu.org Received: via spool by 49990-submit@debbugs.gnu.org id=B49990.16306219745834 (code B ref 49990); Thu, 02 Sep 2021 22:33:01 +0000 Received: (at 49990) by debbugs.gnu.org; 2 Sep 2021 22:32:54 +0000 Received: from localhost ([127.0.0.1]:42289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLvGQ-0001W2-L3 for submit@debbugs.gnu.org; Thu, 02 Sep 2021 18:32:54 -0400 Received: from mail-ed1-f49.google.com ([209.85.208.49]:46768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLvGM-0001Rn-9T for 49990@debbugs.gnu.org; Thu, 02 Sep 2021 18:32:53 -0400 Received: by mail-ed1-f49.google.com with SMTP id j13so5167227edv.13 for <49990@debbugs.gnu.org>; Thu, 02 Sep 2021 15:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=muradm-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=mI9WtJTLTo4SZSU9U0P3GCRxrmGK9SR0K2MTHYxYBG8=; b=L61DJgQTF5o5KkQ8HuKBGXFurusl2endVucuFIW8/2rJCIoOCdPrbmWplGHylm9Na4 5wz/jb0RU8eSRZRtwTjrmH7DpszH6wF99z8uAGMdtSJmxTjnHBCPmvRG4UH6INm98VQE 2ZhVp0UUqAbR1KCFc6Oy1yyKIOE8KHmQ5QlW/tSl4GQEJm4ktd03IDjl6js30AUB52oq GNyFWu/41cmxzRN+cTsr/MI8/H5Z+mZyeenS4cApcL8qy87j3WyCXecGYiM4hfqxOTDa FImPxOb+cNgLGlTHj+cBVQOsnRlKUBhZNKZfoa259+w1yvUfv5o0UAriLya4sFg/eCbX OTug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=mI9WtJTLTo4SZSU9U0P3GCRxrmGK9SR0K2MTHYxYBG8=; b=VvVMSu4h6WDZawfvomBBXPNl17bBj70GSEn0iFt7MVX6Yl3P3QgvtkEjKZ+KxAwQom 32+f2Uf2AONipqK1rD1v1Ik1C1tS69E7lKNk2928xVacGQKrR1j6lGOj9KHPticHYKFg BUnOHONq83gO3NN89pHdmSqhsUMgvztW3zfD8lJXkyPIF/jeQKR929ButERFcOuKFLJz dbBnrsGUtAQORmtsr2DMmHXAwmvIhVHwerT5nSUDq+2/i8zOWj7thp1ufkw7jdLP1qB7 QSLM+TJ1MveHOvFBPvnKFhXO3xZCoXggmANkQvvBDYcxhRh6mJDkeAlKHw31BJKgpyb7 22VA== X-Gm-Message-State: AOAM5331YphRYVYJloMX2d631fO2o0GAhR4z4FfRtl1ztv/QBI9aG7QJ ooYzAiB2+wbCjzTeLvvHP85+0FXNBXBuz/pl X-Google-Smtp-Source: ABdhPJy8zIG/4gaB/taGz16mj4tSy68jPMrTL6AmINewYYuOM6kMsEatDEdO6W9QF/OxV0CkpRyCJw== X-Received: by 2002:a50:fe8b:: with SMTP id d11mr643213edt.330.1630621963837; Thu, 02 Sep 2021 15:32:43 -0700 (PDT) Received: from localhost.localdomain ([176.234.10.27]) by smtp.gmail.com with ESMTPSA id by28sm1936449edb.1.2021.09.02.15.32.42 for <49990@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Sep 2021 15:32:42 -0700 (PDT) From: muradm Date: Fri, 3 Sep 2021 01:27:49 +0300 Message-Id: <20210902222749.28633-1-mail@muradm.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , 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=1630622004; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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:dkim-signature; bh=mI9WtJTLTo4SZSU9U0P3GCRxrmGK9SR0K2MTHYxYBG8=; b=Zd4G9GBe1set4VRa8ni7vPIXyVwwC+ZYVSaz5Hzyi2IIOmwwJrZIj1O+sgCsYuIawgGReN nEZMywJMwktpi8mvufZYCwJ2O7FCpHiIW87kZ8iAIhQx8JK6UR30KgGNET1cv4PwoXb1u3 EJTJG9MHz7/1sVFcgGF33jSo52m396zcxv9OzHmceyb+5fSNMeOqm6/43x79iaB2GkR+sx G19XB5JdFMptXg7zPqch+F6y9u8jATk/jEyN5+VPmHjFQHvxmxTErzM+Ax8+CNwHWHGkJz 5V8I0y7HJfrw/zazSQ8sZu2eSDUXCbfQyxzDXGgJWKv9wcF9V1mCM40/smuQ6g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630622004; a=rsa-sha256; cv=none; b=FjSn8sNhVA31gmBU24lS7KTKMBZKUS4ZzbA2pCQaA4Pcr9qZAgfV9TpH3cLryJJEwiN+Oa f5g8HGDE6jrixq4x/53HGsB7hMz8ncgjQ89YEdyGLs9XS+kQiKOtEU/sGlHNuQFAlYH+I3 NGFzreTNoOdnbLViaexZKpwFpZvZN0c5/ruhQr/xhcDs+6zRRuenBnWe5tj+ISBhMEaDVN 6sjlVtaeeYvOKHXenBdtLoD33ywzvO9RWcmgBFrt+Y0XXR24yYvDTyAZaQoTEviz3E0n4f pLVTVQ09mpWRxJqHRELkxVeoqWhzaoYaQCd0peWo9aInIr4ba8/SJcSpndZQZA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm-net.20150623.gappssmtp.com header.s=20150623 header.b=L61DJgQT; 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: 3.58 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm-net.20150623.gappssmtp.com header.s=20150623 header.b=L61DJgQT; dmarc=none; 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: AB0CB104F6 X-Spam-Score: 3.58 X-Migadu-Scanner: scn1.migadu.com X-TUID: U0blTkGcD2WA --- gnu/packages/java.scm | 3 +- .../patches/classpath-instruction-order.patch | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/classpath-instruction-order.patch diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 08ef7a8213..1e29cac401 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -230,7 +230,8 @@ only faster.") (sha256 (base32 "0i99wf9xd3hw1sj2sazychb9prx8nadxh2clgvk3zlmb28v0jbfz")) - (patches (search-patches "classpath-aarch64-support.patch")))) + (patches (search-patches "classpath-aarch64-support.patch" + "classpath-instruction-order.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/classpath-instruction-order.patch b/gnu/packages/patches/classpath-instruction-order.patch new file mode 100644 index 0000000000..278ae912c7 --- /dev/null +++ b/gnu/packages/patches/classpath-instruction-order.patch @@ -0,0 +1,35 @@ +diff -ruN ../classpath/classpath-0.93/native/jni/java-io/java_io_VMFile.c ./native/jni/java-io/java_io_VMFile.c +--- ../classpath/classpath-0.93/native/jni/java-io/java_io_VMFile.c 2006-09-23 08:17:45.000000000 +0300 ++++ ./native/jni/java-io/java_io_VMFile.c 2021-09-03 01:08:17.073644627 +0300 +@@ -278,6 +278,7 @@ + const char *filename; + int result; + jint entryType; ++ int fres; + + /* Don't use the JCL convert function because it throws an exception + on failure */ +@@ -288,9 +289,22 @@ + } + + result = cpio_checkType (filename, &entryType); ++ ++ fres = 1; ++ ++ if (result != CPNATIVE_OK) ++ { ++ fres = 0; ++ } ++ ++ if (entryType != CPFILE_FILE) ++ { ++ fres = 0; ++ } ++ + (*env)->ReleaseStringUTFChars (env, name, filename); + +- return result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0; ++ return fres; + #else /* not WITHOUT_FILESYSTEM */ + return 0; + #endif /* not WITHOUT_FILESYSTEM */ -- 2.33.0