From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] binutils: update to 2.39.
Date: Sat, 17 Sep 2022 06:36:15 +0200 [thread overview]
Message-ID: <20220917043615.wxJkV0vtcS6xQlEcrId8niZlRJBprbHQM-SJ87C10MQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39312@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages binutils
https://github.com/void-linux/void-packages/pull/39312
binutils: update to 2.39.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Most of the testing for this was done as a part of the [gcc12 PR](https://github.com/void-linux/void-packages/pull/34902), this was split on request.
There were some api changes in libfd, the following packages were tested to build against binutils-devel:
- [x] oprofile
- [x] prelink-cross
- [x] kcov
- [x] linux-tools
- [x] distcc
- [x] chroot-distcc
- [x] sbsigntool
- [ ] llvm12 (I can't remember if I tested it with binutils 2.39 or just 2.38, building it takes forever, but it should be fine since it doesn't use `dis-asm.h` afaict)
- [x] rpm (doesn't actually use binutils-devel but it is listed in the makedepends, builds fine without it)
Please test this PR before merging.
Closes: https://github.com/void-linux/void-packages/pull/39291
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39312.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-binutils-39312.patch --]
[-- Type: text/x-diff, Size: 67099 bytes --]
From a03b446869c3117c19eb1932cca2bf8dbbb18633 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 03:46:04 -0700
Subject: [PATCH 01/29] libiberty-devel: update to 20220713
---
srcpkgs/libiberty-devel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libiberty-devel/template b/srcpkgs/libiberty-devel/template
index 1a4e1ca3d594..b04268908c2e 100644
--- a/srcpkgs/libiberty-devel/template
+++ b/srcpkgs/libiberty-devel/template
@@ -1,6 +1,6 @@
# Template file for 'libiberty-devel'
pkgname=libiberty-devel
-version=20210106
+version=20220713
revision=1
wrksrc=libiberty-${version}
build_wrksrc=libiberty
@@ -11,7 +11,7 @@ maintainer="q66 <daniel@octaforge.org>"
license="GPL-3.0-or-later"
homepage="http://gcc.gnu.org/"
distfiles="http://deb.debian.org/debian/pool/main/libi/libiberty/libiberty_${version}.orig.tar.xz"
-checksum=9df153d69914c0f5a9145e0abbb248e72feebab6777c712a30f1c3b8c19047d4
+checksum=b59050f48c8a0f9c9e6fba5d17c7a4f11d1329de0c0dca7331b767a6d2bbe8d9
conflicts="binutils-devel<=2.35.1_3"
CFLAGS="-fPIC"
From 5eea3ea89f7217bf9906b746b1f53676580d6b2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 03:44:16 -0700
Subject: [PATCH 02/29] binutils: update to 2.39.
---
...e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch | 60 -----------------
.../fix-libcollector-without-java.patch | 53 +++++++++++++++
.../patches/ppc64-revert-gnu-attributes.patch | 66 +++++--------------
srcpkgs/binutils/template | 22 +++++--
4 files changed, 86 insertions(+), 115 deletions(-)
delete mode 100644 srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
create mode 100644 srcpkgs/binutils/patches/fix-libcollector-without-java.patch
diff --git a/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch b/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
deleted file mode 100644
index a55432d83cff..000000000000
--- a/srcpkgs/binutils/patches/1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 1767e3f3bd6d460491f8c8d032a7fea88d5ec8ff Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Mon, 16 Nov 2020 06:37:53 -0800
-Subject: [PATCH] elf: Set rel_from_abs to 1 for __ehdr_start
-
-bfdlink.h has
-
- /* Symbol will be converted from absolute to section-relative. Set for
- symbols defined by a script from "dot" (also SEGMENT_START or ORIGIN)
- outside of an output section statement. */
- unsigned int rel_from_abs : 1;
-
-linker.c has
-
-.{* Return TRUE if the symbol described by a linker hash entry H
-. is going to be absolute. Linker-script defined symbols can be
-. converted from absolute to section-relative ones late in the
-. link. Use this macro to correctly determine whether the symbol
-. will actually end up absolute in output. *}
-.#define bfd_is_abs_symbol(H) \
-. (((H)->type == bfd_link_hash_defined \
-. || (H)->type == bfd_link_hash_defweak) \
-. && bfd_is_abs_section ((H)->u.def.section) \
-. && !(H)->rel_from_abs)
-.
-
-Set rel_from_abs to 1 for __ehdr_start which will be converted from
-absolute to section-relative in assign_file_positions_for_load_sections.
-
- PR ld/26869
- * ldelf.c (ldelf_before_allocation): Set rel_from_abs to 1 for
- __ehdr_start.
- * testsuite/ld-i386/i386.exp: Run pr26869.
- * testsuite/ld-i386/pr26869.d: New file.
- * testsuite/ld-i386/pr26869.s: Likewise.
-
-(cherry picked from commit cbd5b99cce073273f668b154d4514e8e7e7ccc51)
----
- ld/ChangeLog | 9 +++++++++
- ld/ldelf.c | 2 ++
- ld/testsuite/ld-i386/i386.exp | 1 +
- ld/testsuite/ld-i386/pr26869.d | 14 ++++++++++++++
- ld/testsuite/ld-i386/pr26869.s | 3 +++
- 5 files changed, 29 insertions(+)
- create mode 100644 ld/testsuite/ld-i386/pr26869.d
- create mode 100644 ld/testsuite/ld-i386/pr26869.s
-
-diff --git a/ld/ldelf.c b/ld/ldelf.c
-index bada3ade2d7..831d032fe56 100644
---- a/ld/ldelf.c
-+++ b/ld/ldelf.c
-@@ -1589,6 +1589,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
- (char *) &ehdr_start->u + sizeof ehdr_start->u.def.next,
- sizeof ehdr_start_save_u);
- ehdr_start->type = bfd_link_hash_defined;
-+ /* It will be converted to section-relative later. */
-+ ehdr_start->rel_from_abs = 1;
- ehdr_start->u.def.section = bfd_abs_section_ptr;
- ehdr_start->u.def.value = 0;
- }
diff --git a/srcpkgs/binutils/patches/fix-libcollector-without-java.patch b/srcpkgs/binutils/patches/fix-libcollector-without-java.patch
new file mode 100644
index 000000000000..54384875f358
--- /dev/null
+++ b/srcpkgs/binutils/patches/fix-libcollector-without-java.patch
@@ -0,0 +1,53 @@
+From 49ddd814ac1071af7c4f45d5f8398b91862f2c7f Mon Sep 17 00:00:00 2001
+From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
+Date: Wed, 17 Aug 2022 19:55:23 -0700
+Subject: [PATCH] gprofng: fix bug 29479 Collection fails when built without
+ java support
+
+gprofng/ChangeLog
+2022-08-17 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
+
+ PR gprofng/29479
+ * libcollector/collector.c: Add #if defined(GPROFNG_JAVA_PROFILING) for
+ java specific code.
+ * libcollector/unwind.c: Likewise.
+---
+ gprofng/libcollector/collector.c | 2 ++
+ gprofng/libcollector/unwind.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c
+index 93c9d3330de5..ceff2c1caccb 100644
+--- a/gprofng/libcollector/collector.c
++++ b/gprofng/libcollector/collector.c
+@@ -913,8 +913,10 @@ __collector_open_experiment (const char *exp, const char *params, sp_origin_t or
+ __collector_ext_unwind_key_init (1, NULL);
+
+ /* start java attach if suitable */
++#if defined(GPROFNG_JAVA_PROFILING)
+ if (exp_origin == SP_ORIGIN_DBX_ATTACH)
+ __collector_jprofile_start_attach ();
++#endif
+ start_sec_time = CALL_UTIL (time)(NULL);
+ __collector_start_time = collector_interface.getHiResTime ();
+ TprintfT (DBG_LT0, "\t__collector_open_experiment; resetting start_time\n");
+diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c
+index 119243788020..f8e11823c81e 100644
+--- a/gprofng/libcollector/unwind.c
++++ b/gprofng/libcollector/unwind.c
+@@ -557,6 +557,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg)
+ int size = max_frame_size;
+
+ #define MIN(a,b) ((a)<(b)?(a):(b))
++#if defined(GPROFNG_JAVA_PROFILING)
+ /* get Java info */
+ if (__collector_java_mode && __collector_java_asyncgetcalltrace_loaded && context && !pseudo_context)
+ {
+@@ -569,6 +570,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg)
+ size -= sz;
+ }
+ }
++#endif
+
+ /* get native stack */
+ if (context)
diff --git a/srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch b/srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch
index 5de937f4fcce..1c208dd8955c 100644
--- a/srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch
+++ b/srcpkgs/binutils/patches/ppc64-revert-gnu-attributes.patch
@@ -1,39 +1,24 @@
-From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
+From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 30 Oct 2020 16:59:48 -0600
+Date: Tue, 21 Sep 2021 14:53:13 +0000
Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
libraries"
+This revert is needed to avoid wrongly tagging objects with the incompatible
+IBM long double ABI, which is not supported by musl and will result in
+linking errors if used.
+
This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/ChangeLog | 6 ------
- bfd/elf32-tic6x.c | 3 ---
- ld/ChangeLog | 6 ------
- ld/ldlang.c | 9 ++++-----
- 4 files changed, 4 insertions(+), 20 deletions(-)
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ldlang.c | 10 ++++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 9fac12538a..b5461494e8 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1422,12 +1422,6 @@
- accessing root.u.def of symbols. Also check root.u.def.section
- is non-NULL. Reverse tests so as to make the logic positive.
-
--2020-05-01 Alan Modra <amodra@gmail.com>
--
-- PR 25882
-- * elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
-- Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
--
- 2020-05-01 Alan Modra <amodra@gmail.com>
-
- PR 25882
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index b8b916bfd3..91bb6a10b1 100644
+index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
-@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
case Tag_ABI_PIC:
case Tag_ABI_PID:
@@ -43,36 +28,20 @@ index b8b916bfd3..91bb6a10b1 100644
if (out_attr[i].i > in_attr[i].i)
out_attr[i].i = in_attr[i].i;
break;
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index 4eec7d2977..b93452f70c 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1319,12 +1319,6 @@
- * testsuite/ld-aarch64/farcall-group.d: New test driver.
- * testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
-
--2020-05-01 Alan Modra <amodra@gmail.com>
--
-- PR 25882
-- * ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
-- shared libraries.
--
- 2020-05-01 Alan Modra <amodra@gmail.com>
-
- * po/BLD-POTFILES.in: Regenerate.
diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 9977195074..173d8ec349 100644
+index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
-@@ -6972,12 +6972,11 @@ lang_check (void)
+@@ -7071,13 +7071,11 @@ lang_check (void)
bfd_printable_name (input_bfd), input_bfd,
bfd_printable_name (link_info.output_bfd));
}
-
- /* If the input bfd has no contents, it shouldn't set the
- private data of the output bfd. */
-- else if ((input_bfd->flags & DYNAMIC) != 0
-- || bfd_count_sections (input_bfd) != 0)
+- else if (!file->flags.just_syms
+- && ((input_bfd->flags & DYNAMIC) != 0
+- || bfd_count_sections (input_bfd) != 0))
+ else if (bfd_count_sections (input_bfd))
{
+ /* If the input bfd has no contents, it shouldn't set the
@@ -82,5 +51,4 @@ index 9977195074..173d8ec349 100644
/* If we aren't supposed to warn about mismatched input
--
-2.29.2
-
+2.33.0
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 6270f8618c87..7002a308b2ab 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,19 +1,20 @@
# Template file for 'binutils'
pkgname=binutils
-version=2.35.1
-revision=4
+version=2.39
+revision=1
bootstrap=yes
+hostmakedepends="pkg-config"
makedepends="zlib-devel"
short_desc="GNU binary utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/binutils/"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
+checksum=645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
subpackages="binutils-doc"
if [ "$CHROOT_READY" ]; then
- hostmakedepends="flex perl texinfo"
+ hostmakedepends+=" flex perl texinfo"
makedepends+=" elfutils-devel"
checkdepends="bc"
depends="binutils-doc"
@@ -44,6 +45,12 @@ do_configure() {
conf+=" --host=${XBPS_CROSS_TRIPLET} --with-build-sysroot=${XBPS_CROSS_BASE}"
fi
+ # gprofng currently only supports x86 and aarch64 glibc.
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64|i386|aarch64) conf+=" --enable-gprofng" ;;
+ *) conf+=" --disable-gprofng" ;;
+ esac
+
case "$XBPS_TARGET_MACHINE" in
ppc*)
conf+=" --enable-secureplt"
@@ -76,13 +83,15 @@ do_configure() {
--libdir=/usr/lib \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
+ --sysconfdir=/etc \
--disable-werror \
- --disable-shared \
--disable-nls \
+ --enable-shared \
--enable-threads \
--enable-plugins \
--enable-relro \
--enable-gold \
+ --enable-new-dtags \
--enable-deterministic-archives \
--enable-64-bit-bfd \
--enable-ld=default \
@@ -142,7 +151,8 @@ binutils-devel_package() {
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
+ vmove "usr/lib/libbfd.so"
+ vmove "usr/lib/libopcodes.so"
}
}
From 4e256ac231f67530a48b7784a1f1595670a75879 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 03:47:32 -0700
Subject: [PATCH 03/29] kcov: fix build with binutils 2.39
---
.../0001-Fix-build-with-binutils-2.39.patch | 97 +++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 srcpkgs/kcov/patches/0001-Fix-build-with-binutils-2.39.patch
diff --git a/srcpkgs/kcov/patches/0001-Fix-build-with-binutils-2.39.patch b/srcpkgs/kcov/patches/0001-Fix-build-with-binutils-2.39.patch
new file mode 100644
index 000000000000..5e666aacefc9
--- /dev/null
+++ b/srcpkgs/kcov/patches/0001-Fix-build-with-binutils-2.39.patch
@@ -0,0 +1,97 @@
+From fd1a4fd2f02cee49afd74e427e38c61b89154582 Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Wed, 14 Sep 2022 16:02:17 -0700
+Subject: [PATCH] Fix build with binutils 2.39
+
+---
+ src/CMakeLists.txt | 20 +++++++++++++++++++-
+ src/parsers/bfd-disassembler.cc | 23 +++++++++++++++++++++++
+ 2 files changed, 42 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3b751852..fc396827 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -94,6 +94,7 @@ set (DISASSEMBLER_SRCS
+ )
+
+ set (HAS_LIBBFD "0")
++set (HAS_LIBBFD_DISASM_STYLED "0")
+
+ if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64")
+ if (LIBBFD_FOUND)
+@@ -106,6 +107,23 @@ if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STR
+ ${LIBBFD_BFD_LIBRARY}
+ ${LIBBFD_IBERTY_LIBRARY}
+ )
++ include(CheckCSourceCompiles)
++ set(CMAKE_REQUIRED_LIBRARIES ${DISASSEMBLER_LIBRARIES})
++ check_c_source_compiles("
++ #define PACKAGE
++ #define PACKAGE_VERSION
++ #include <stdio.h>
++ #include <dis-asm.h>
++
++ int main(int argc, char **argv){
++ struct disassemble_info info;
++ init_disassemble_info(&info, stdout, NULL, NULL);
++ return 0;
++ }
++ " TEST_LIBBFD_DISASM_STYLED)
++ if (TEST_LIBBFD_DISASM_STYLED)
++ set (HAS_LIBBFD_DISASM_STYLED "1")
++ endif (TEST_LIBBFD_DISASM_STYLED)
+ endif (LIBBFD_FOUND)
+ endif (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64")
+
+@@ -284,7 +302,7 @@ set (KCOV_SYSTEM_MODE_SRCS
+
+ set (KCOV_LIBRARY_PREFIX "/tmp")
+
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD}")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD} -DKCOV_LIBFD_DISASM_STYLED=${HAS_LIBBFD_DISASM_STYLED}")
+
+ include_directories(
+ include/
+diff --git a/src/parsers/bfd-disassembler.cc b/src/parsers/bfd-disassembler.cc
+index 43653ee0..28815961 100644
+--- a/src/parsers/bfd-disassembler.cc
++++ b/src/parsers/bfd-disassembler.cc
+@@ -75,7 +75,11 @@ class BfdDisassembler : public IDisassembler
+ BfdDisassembler()
+ {
+ memset(&m_info, 0, sizeof(m_info));
++#if KCOV_LIBFD_DISASM_STYLED
++ init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic, BfdDisassembler::opcodesFprintStyledFuncStatic);
++#else
+ init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic);
++#endif
+ m_disassembler = print_insn_i386;
+
+ m_info.arch = bfd_arch_i386;
+@@ -407,6 +411,25 @@ class BfdDisassembler : public IDisassembler
+ return out;
+ }
+
++#if KCOV_LIBFD_DISASM_STYLED
++ static int opcodesFprintStyledFuncStatic(void *info, enum disassembler_style style, const char *fmt, ...)
++ {
++ (void)style;
++ BfdDisassembler *pThis = (BfdDisassembler *)info;
++ char str[64];
++ int out;
++
++ va_list args;
++ va_start (args, fmt);
++ out = vsnprintf( str, sizeof(str) - 1, fmt, args );
++ va_end (args);
++
++ pThis->opcodesFprintFunc(str);
++
++ return out;
++ }
++#endif
++
+ typedef std::map<uint64_t, Section *> SectionCache_t;
+ typedef std::unordered_map<uint64_t, Instruction> InstructionAddressMap_t;
+ typedef std::map<uint64_t, Instruction *> InstructionOrderedMap_t;
From aa2562ceca976d9b7582a773c0fe9969c8840f94 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 04:09:00 -0700
Subject: [PATCH 04/29] gdb: resolve conflict with binutils 2.39
---
srcpkgs/gdb/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index ff7c9d9a5911..5970402eb27e 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
# Template file for 'gdb'
pkgname=gdb
version=12.1
-revision=1
+revision=2
build_style=gnu-configure
pycompile_dirs="/usr/share/gdb/python"
configure_args="--disable-werror --disable-nls --with-system-readline
@@ -48,7 +48,8 @@ vopt_conflict debuginfod static
post_install() {
# resolve conflicts with binutils
- rm -r ${DESTDIR}/usr/{include,lib,share/info/bfd.info*}
+ rm -rf ${DESTDIR}/usr/{include,lib}
+ rm -rf ${DESTDIR}/usr/share/info/{bfd,ctf-spec}.info*
}
gdb-common_package() {
From ab03a27789d1c2c56eef27688b9bd607ad9ac9e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 15:54:51 -0700
Subject: [PATCH 05/29] build-style/void-cross: update to binutils 2.39.
Centralize versions and distfiles for void-cross.
---
common/build-style/void-cross.sh | 6 ++++
common/environment/build-style/void-cross.sh | 34 ++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 92f03f8130f5..41b396fcb875 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -53,6 +53,7 @@ _void_cross_build_binutils() {
--sbindir=/usr/bin \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
+ --sysconfdir=/etc \
--target=${tgt} \
--with-sysroot=/usr/${tgt} \
--disable-nls \
@@ -60,8 +61,10 @@ _void_cross_build_binutils() {
--disable-multilib \
--disable-werror \
--disable-gold \
+ --disable-gprofng \
--enable-relro \
--enable-plugins \
+ --enable-new-dtags \
--enable-64-bit-bfd \
--enable-deterministic-archives \
--enable-default-hash-style=gnu \
@@ -625,6 +628,9 @@ do_install() {
# then remove it because it conflicts with libquadmath package
rm -rf ${DESTDIR}/${sysroot}/usr/lib/libquadmath.*
+ # Remove libdep linker plugin because it conflicts with system binutils
+ rm -f ${DESTDIR}/usr/lib/bfd-plugins/libdep*
+
# Remove leftover symlinks
rm -f ${DESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
rm -f ${DESTDIR}/lib*
diff --git a/common/environment/build-style/void-cross.sh b/common/environment/build-style/void-cross.sh
index 62ce9eaa2e4a..a1ca993d3002 100644
--- a/common/environment/build-style/void-cross.sh
+++ b/common/environment/build-style/void-cross.sh
@@ -1,6 +1,40 @@
+_void_cross_setup_distfiles() {
+ local tgt=${sourcepkg/cross-}
+
+ local _binutils_version=2.39
+ local _gcc_version=10.2.1_pre1
+ local _glibc_version=2.32
+ local _musl_version=1.1.24
+ local _libucontext_version=1.0
+ local _linux_version=5.10.4
+
+ distfiles+=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
+ https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz"
+ checksum+=" 645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+ 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590"
+ case "$tgt" in
+ *-gnu*)
+ distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
+ checksum+=" 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836"
+ ;;
+ *-musl*)
+ distfiles+=" https://musl.libc.org/releases/musl-${_musl_version}.tar.gz"
+ checksum+=" 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3"
+ if [ -z "$cross_gcc_skip_go" ];then
+ distfiles+=" https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
+ checksum+=" 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+ fi
+ ;;
+ *) msg_error "Could not determine libc for ${tgt}\n" ;;
+ esac
+ distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
+ checksum+=" 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+}
+
lib32disabled=yes
nopie=yes
create_wrksrc=yes
nostrip_files+=" libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a"
+_void_cross_setup_distfiles
From 0ca5414210a87b8cf11b7d510cb17d66ebd4428a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:41 -0700
Subject: [PATCH 06/29] cross-aarch64-linux-gnu: rebuild for binutils 2.39
---
srcpkgs/cross-aarch64-linux-gnu/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 18de21aa3ccd..62a1bcf4de6e 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,11 +1,7 @@
# Template file for 'cross-aarch64-linux-gnu'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -15,15 +11,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_glibc_cflags="-O2 -march=armv8-a"
From e0c9292b3490589e07720ec50ed1a632c6a0d179 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:42 -0700
Subject: [PATCH 07/29] cross-aarch64-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-aarch64-linux-musl/template | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index bb6a770afb79..1a27eb524106 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,12 +1,7 @@
# Template file for 'cross-aarch64-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.34
-revision=4
+revision=5
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -14,19 +9,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_musl_cflags="-O2 -march=armv8-a"
From eb9a2d85fb16a9268119774b898e3cd3c9f170af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:42 -0700
Subject: [PATCH 08/29] cross-arm-linux-gnueabi: rebuild for binutils 2.39
---
srcpkgs/cross-arm-linux-gnueabi/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index a3aba72aa93a..1ef3010dc050 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,11 +1,7 @@
# Template file for 'cross-arm-linux-gnueabi'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -15,15 +11,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_binutils_configure_args="--without-fp"
From 77582ef57fef4958abb3b2bf74561ff4c4a9b332 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:42 -0700
Subject: [PATCH 09/29] cross-arm-linux-gnueabihf: rebuild for binutils 2.39
---
srcpkgs/cross-arm-linux-gnueabihf/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d9ab86cf2ecc..c35181bf64ad 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,11 +1,7 @@
# Template file for 'cross-arm-linux-gnueabihf'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabihf
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -15,15 +11,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_glibc_cflags="-Os -march=armv6 -mfpu=vfp -mfloat-abi=hard"
From 81ebdb6ddc3be0c0a8f59d916afe68c753ee025e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:42 -0700
Subject: [PATCH 10/29] cross-arm-linux-musleabi: rebuild for binutils 2.39
---
srcpkgs/cross-arm-linux-musleabi/template | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 6692d891e1bd..bc063dc3a74e 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,12 +1,7 @@
# Template file for 'cross-arm-linux-musleabi'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.34
-revision=4
+revision=5
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -14,19 +9,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_binutils_configure_args="--without-fp"
From 17c9f4b24db197adcd4b00b4fb5ad24822c53883 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:42 -0700
Subject: [PATCH 11/29] cross-arm-linux-musleabihf: rebuild for binutils 2.39
---
srcpkgs/cross-arm-linux-musleabihf/template | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index bb62bd5ebc55..9c04be4c982a 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,12 +1,7 @@
# Template file for 'cross-arm-linux-musleabihf'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.34
-revision=4
+revision=5
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -14,19 +9,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_musl_cflags="-Os -march=armv6 -mfpu=vfp -mfloat-abi=hard"
From 8bdaf0f6027111977739efb1cc1d80d060ec18f7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:42 -0700
Subject: [PATCH 12/29] cross-armv7l-linux-gnueabihf: rebuild for binutils 2.39
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 30c89b6294ef..3e470c0d219e 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,11 +1,7 @@
# Template file for 'cross-armv7l-linux-gnueabihf'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -15,15 +11,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_glibc_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
From 3f23508e1ecb6340da519f43e214619d5a96f5c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:43 -0700
Subject: [PATCH 13/29] cross-armv7l-linux-musleabihf: rebuild for binutils
2.39
---
.../cross-armv7l-linux-musleabihf/template | 20 ++-----------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 0a588cdf1a58..5eaf57e7037c 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,12 +1,7 @@
# Template file for 'cross-armv7l-linux-musleabihf'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.34
-revision=4
+revision=5
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
@@ -14,19 +9,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_musl_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
From 10534e4cb50984f11275ff1fe5c848d2c5e84260 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:43 -0700
Subject: [PATCH 14/29] cross-i686-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-i686-linux-musl/template | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 8be16a230d8d..ad9592e7fa26 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,31 +1,15 @@
# Template file for 'cross-i686-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.34
-revision=4
+revision=5
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
# explicitly enable for final gcc, as gfortran does not build without on x86
From f4de562fcb982073cbbe9498f1a4a839fa0823d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:43 -0700
Subject: [PATCH 15/29] cross-i686-pc-linux-gnu: rebuild for binutils 2.39
---
srcpkgs/cross-i686-pc-linux-gnu/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 263a43f7a7b8..076dadf856fe 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,11 +1,7 @@
# Template file for 'cross-i686-pc-linux-gnu'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.34
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
@@ -14,15 +10,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
# explicitly enable for final gcc, as gfortran does not build without on x86
From c22367abbe910227a860521b9d914f54f99f19c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:43 -0700
Subject: [PATCH 16/29] cross-mips-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-mips-linux-musl/template | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 9b5d5819b1a0..1485ffb0db6a 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,11 +1,7 @@
# Template file for 'cross-mips-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
@@ -14,17 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_gcc_skip_go=yes
From 66b30eac81d3b1817a62fc7305b6f5ed53284700 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:43 -0700
Subject: [PATCH 17/29] cross-mips-linux-muslhf: rebuild for binutils 2.39
---
srcpkgs/cross-mips-linux-muslhf/template | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index d7590af9ec03..f82d85239e9e 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,11 +1,7 @@
# Template file for 'cross-mips-linux-muslhf'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
@@ -14,17 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="hipperson0 <hipperson0@gmail.com>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_gcc_skip_go=yes
From d204af7943225bb03f74d4e1003f3d8acd7d038d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:43 -0700
Subject: [PATCH 18/29] cross-mipsel-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-mipsel-linux-musl/template | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 1acba7016dbc..75a11c9b9702 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,11 +1,7 @@
# Template file for 'cross-mipsel-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
@@ -14,17 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_gcc_skip_go=yes
From a6064789432f1beebcec10177c2271718739609a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:44 -0700
Subject: [PATCH 19/29] cross-mipsel-linux-muslhf: rebuild for binutils 2.39
---
srcpkgs/cross-mipsel-linux-muslhf/template | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index e4a55f028bc4..766f1911ebf0 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,11 +1,7 @@
# Template file for 'cross-mipsel-linux-muslhf'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
@@ -14,17 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_gcc_skip_go=yes
From 9c43c92e78df42fc7969cd947d21c39c9ec0327e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:44 -0700
Subject: [PATCH 20/29] cross-powerpc-linux-gnu: rebuild for binutils 2.39
---
srcpkgs/cross-powerpc-linux-gnu/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index b97a21d0d72e..804f67a4a9d5 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,11 +1,7 @@
# Template file for 'cross-powerpc-linux-gnu'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
@@ -15,15 +11,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Thomas Batten <stenstorpmc@gmail.com>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_gcc_skip_go=yes
From 816eb57c9dd4731b4f319faf8b22daf4ded03060 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:44 -0700
Subject: [PATCH 21/29] cross-powerpc-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-powerpc-linux-musl/template | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index f9b22f0610d3..7513928eb5b3 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,11 +1,7 @@
# Template file for 'cross-powerpc-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
@@ -14,17 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Thomas Batten <stenstorpmc@gmail.com>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_gcc_skip_go=yes
From d0c685db5a1429760ead8b64a507499954357fa6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:44 -0700
Subject: [PATCH 22/29] cross-powerpc64-linux-gnu: rebuild for binutils 2.39
---
srcpkgs/cross-powerpc64-linux-gnu/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 35cfcaa6f02e..a6e782d78aa6 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,11 +1,7 @@
# Template file for 'cross-powerpc64-linux-gnu'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
@@ -16,15 +12,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_binutils_configure_args="--enable-secureplt"
From 853f643f321db523132fec5aa480faddcda54c50 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:44 -0700
Subject: [PATCH 23/29] cross-powerpc64-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-powerpc64-linux-musl/template | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 1ebd0fb2048d..a658d4582578 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,12 +1,7 @@
# Template file for 'cross-powerpc64-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.34
-revision=4
+revision=5
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
@@ -15,19 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="q66 <daniel@octaforge.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_binutils_configure_args="--enable-secureplt"
From 8405794fe2790f7c7edeab14ecac8c8ff636719d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:44 -0700
Subject: [PATCH 24/29] cross-powerpc64le-linux-gnu: rebuild for binutils 2.39
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 733f5851da5c..e8458b770e32 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,11 +1,7 @@
# Template file for 'cross-powerpc64le-linux-gnu'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
@@ -16,15 +12,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="q66 <daniel@octaforge.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_binutils_configure_args="--enable-secureplt"
From 93499854b35e83e194f4fd9e82abce4782e9ee5e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:44 -0700
Subject: [PATCH 25/29] cross-powerpc64le-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-powerpc64le-linux-musl/template | 20 ++-----------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 76a70aa1d6db..367dfad2a920 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,12 +1,7 @@
# Template file for 'cross-powerpc64le-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.34
-revision=4
+revision=5
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
@@ -15,19 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="q66 <daniel@octaforge.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_binutils_configure_args="--enable-secureplt"
From 50bdd19781b50341f21dc20da554c66e99546ddd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:45 -0700
Subject: [PATCH 26/29] cross-powerpcle-linux-gnu: rebuild for binutils 2.39
---
srcpkgs/cross-powerpcle-linux-gnu/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 347b8fcf4f55..950fa1a3e62f 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -1,11 +1,7 @@
# Template file for 'cross-powerpcle-linux-gnu'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.34
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
@@ -15,15 +11,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="q66 <daniel@octaforge.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
cross_gcc_skip_go=yes
From 00bfbc82460a45a11fcf8e7bc5449759957b895d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:45 -0700
Subject: [PATCH 27/29] cross-powerpcle-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-powerpcle-linux-musl/template | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index ec9324ddaa99..e57a2cfe4e12 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -1,11 +1,7 @@
# Template file for 'cross-powerpcle-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
@@ -14,17 +10,8 @@ makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="q66 <daniel@octaforge.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+homepage="https://www.voidlinux.org/"
nocross=yes
cross_gcc_skip_go=yes
From 323dbca3ecf8bf4294ea92bbf78c293a5515ae5d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:45 -0700
Subject: [PATCH 28/29] cross-x86_64-linux-gnu: rebuild for binutils 2.39
---
srcpkgs/cross-x86_64-linux-gnu/template | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 0078fbe7224b..cc0e5744d648 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -1,11 +1,7 @@
# Template file for 'cross-x86_64-linux-gnu'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_glibc_version=2.32
-_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.34
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
@@ -14,15 +10,6 @@ short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="q66 <daniel@octaforge.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://www.voidlinux.org/"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
nocross=yes
# explicitly enable for final gcc, gfortran does not build without on x86
From 07bfd722b4e9adb7b1a1e63f2f54a16c66cd3506 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 16 Sep 2022 20:44:45 -0700
Subject: [PATCH 29/29] cross-x86_64-linux-musl: rebuild for binutils 2.39
---
srcpkgs/cross-x86_64-linux-musl/template | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index a941e7e02f6f..6d8812bb21bd 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,31 +1,15 @@
# Template file for 'cross-x86_64-linux-musl'
-_binutils_version=2.35.1
-_gcc_version=10.2.1_pre1
-_musl_version=1.1.24
-_linux_version=5.10.4
-_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.34
-revision=3
+revision=4
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
depends="${pkgname}-libc-${version}_${revision}"
short_desc="Void cross toolchain for ${pkgname/cross-}"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
-distfiles="
- ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
- https://dev.alpinelinux.org/~nenolod/gcc-${_gcc_version}.tar.xz
- https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
- https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
- 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
- 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
- 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
+homepage="https://www.voidlinux.org/"
nocross=yes
# explicitly enable for final gcc, gfortran does not build without on x86
next prev parent reply other threads:[~2022-09-17 4:36 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 10:59 [PR PATCH] Binutils oreo639
2022-09-16 11:09 ` [PR PATCH] [Updated] binutils: update to 2.39 oreo639
2022-09-16 11:17 ` oreo639
2022-09-16 13:28 ` oreo639
2022-09-16 17:46 ` dkwo
2022-09-16 22:44 ` oreo639
2022-09-17 4:09 ` [PR PATCH] [Updated] " oreo639
2022-09-17 4:11 ` oreo639
2022-09-17 4:36 ` oreo639 [this message]
2022-09-17 5:09 ` oreo639
2022-09-17 11:44 ` dkwo
2022-09-17 11:53 ` dkwo
2022-09-17 12:05 ` paper42
2022-09-18 22:19 ` [PR PATCH] [Updated] " oreo639
2022-09-18 22:37 ` oreo639
2022-09-18 22:39 ` oreo639
2022-09-18 22:59 ` oreo639
2022-09-19 0:27 ` oreo639
2022-09-25 1:12 ` oreo639
2022-09-25 1:20 ` oreo639
2022-09-25 1:43 ` oreo639
2022-09-25 1:43 ` oreo639
2022-09-25 1:44 ` oreo639
2022-10-03 2:52 ` oreo639
2022-10-03 2:53 ` oreo639
2022-12-17 6:11 ` [PR PATCH] [Closed]: " oreo639
2022-12-17 6:11 ` oreo639
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220917043615.wxJkV0vtcS6xQlEcrId8niZlRJBprbHQM-SJ87C10MQ@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.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.
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 NNTP newsgroup(s).