From: Simon South <simon@simonsouth.net>
To: 41871@debbugs.gnu.org
Cc: Simon South <simon@simonsouth.net>
Subject: [bug#41871] [PATCH 5/7] gnu: icedtea-7: Fix build on aarch64-linux.
Date: Mon, 15 Jun 2020 11:22:55 -0400 [thread overview]
Message-ID: <20200615152257.12938-5-simon@simonsouth.net> (raw)
In-Reply-To: <20200615152257.12938-1-simon@simonsouth.net>
* gnu/packages/java.scm (icedtea-7)[native-inputs]: Remove obsolete,
architecture-dependent patch to "hotspot-drop"; replace with patch to fix
build on aarch64-linux.
* gnu/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 2 +-
.../icedtea-7-hotspot-aarch64-use-c++98.patch | 33 +++++++++++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 36dbbd0968..4c030a57db 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1094,6 +1094,7 @@ dist_patch_DATA = \
%D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \
%D%/packages/patches/icecat-use-system-media-libs.patch \
%D%/packages/patches/icedtea-6-extend-hotspot-aarch64-support.patch \
+ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \
%D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \
%D%/packages/patches/icu4c-CVE-2020-10531.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 5f46e883fc..b86e9aab61 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1599,7 +1599,7 @@ bootstrapping purposes.")
(base32
"17bdv39n4lh8l5737c96f3xgamx4y305m067p01cywgp7zaddqws"))
(patches (search-patches
- "icedtea-7-hotspot-gcc-segfault-workaround.patch"))))
+ "icedtea-7-hotspot-aarch64-use-c++98.patch"))))
("ant" ,ant-bootstrap)
("attr" ,attr)
("coreutils" ,coreutils)
diff --git a/gnu/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch b/gnu/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch
new file mode 100644
index 0000000000..7ad215f975
--- /dev/null
+++ b/gnu/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch
@@ -0,0 +1,33 @@
+From 919dd016be1abd213b3a7d0e9a3b79e3286ef6ad Mon Sep 17 00:00:00 2001
+From: Simon South <simon@simonsouth.net>
+Date: Wed, 10 Jun 2020 13:02:09 -0400
+Subject: [PATCH] aarch64: Use only C++98
+
+This patch removes an unneeded C++ template that causes the build to
+fail for aarch64 using gcc 7.5.0 and its default support for only the
+C++98 standard.
+
+It is based on original work by Severin Gehwolf <sgehwolf@redhat.com>.
+See: https://bugzilla.redhat.com/show_bug.cgi?id=1307224
+---
+ src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+index 0bc0a2b..6f73ca0 100644
+--- a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
++++ b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+@@ -194,10 +194,6 @@ static int reg2offset_out(VMReg r) {
+ return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
+ }
+
+-template <class T> static const T& min (const T& a, const T& b) {
+- return (a > b) ? b : a;
+-}
+-
+ // ---------------------------------------------------------------------------
+ // Read the array of BasicTypes from a signature, and compute where the
+ // arguments should go. Values in the VMRegPair regs array refer to 4-byte
+--
+2.26.2
+
--
2.26.2
next prev parent reply other threads:[~2020-06-15 15:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 15:18 [bug#41871] [PATCH 0/7] IcedTea: Build (efficiently) on aarch64-linux Simon South
2020-06-15 15:22 ` [bug#41871] [PATCH 1/7] gnu: icedtea-6: Build in parallel using correct number of jobs Simon South
2020-06-15 15:22 ` [bug#41871] [PATCH 2/7] gnu: icedtea-6: Remove obsolete, architecture-dependent patch Simon South
2020-06-15 15:22 ` [bug#41871] [PATCH 3/7] gnu: icedtea-6: Fix build on aarch64-linux Simon South
2020-06-15 15:22 ` [bug#41871] [PATCH 4/7] gnu: icedtea-7: Build in parallel using correct number of jobs Simon South
2020-06-15 15:22 ` Simon South [this message]
2020-06-15 15:22 ` [bug#41871] [PATCH 6/7] gnu: icedtea-8: " Simon South
2020-06-15 15:22 ` [bug#41871] [PATCH 7/7] gnu: icedtea-8: Fix build on aarch64-linux Simon South
2020-09-14 13:24 ` [bug#41871] [PATCH 0/7] IcedTea: Build (efficiently) " Ricardo Wurmus
2020-10-28 8:51 ` Efraim Flashner
2020-10-28 14:35 ` Simon South
2020-10-29 13:15 ` Efraim Flashner
2020-11-02 9:54 ` Efraim Flashner
2020-11-02 12:35 ` Simon South
2020-11-03 12:59 ` Simon South
2020-11-03 13:24 ` Efraim Flashner
2020-11-03 13:41 ` Simon South
2020-11-04 10:58 ` bug#41871: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200615152257.12938-5-simon@simonsouth.net \
--to=simon@simonsouth.net \
--cc=41871@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).