From 7926019217453b83b611f9bd9ae17bb3c47ba7d4 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 22 May 2023 08:49:27 +0200 Subject: [PATCH] cross/binutils-*: upgrade to 2.40-r8 (MR 4107) Generated with: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/patches/41318 --- cross/binutils-aarch64/APKBUILD | 39 ++++++++++++++++++++------------- cross/binutils-armhf/APKBUILD | 39 ++++++++++++++++++++------------- cross/binutils-armv7/APKBUILD | 39 ++++++++++++++++++++------------- cross/binutils-riscv64/APKBUILD | 39 ++++++++++++++++++++------------- 4 files changed, 96 insertions(+), 60 deletions(-) diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD index 78e24f680..be3b8d49d 100644 --- a/cross/binutils-aarch64/APKBUILD +++ b/cross/binutils-aarch64/APKBUILD @@ -8,11 +8,11 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-aarch64 pkgver=2.40 -pkgrel=7 +pkgrel=8 pkgdesc="Tools necessary to build programs for aarch64 targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" -makedepends_host="zlib-dev zstd-dev" +makedepends_host="zlib-dev jansson-dev zstd-dev" makedepends="$makedepends_build $makedepends_host" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause" @@ -23,6 +23,10 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz " builddir="$srcdir/binutils-$pkgver" +if [ -z "$BOOTSTRAP" ]; then + makedepends_host="$makedepends_host jansson-dev zstd-dev" +fi + if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then subpackages="$subpackages binutils-gold" fi @@ -84,22 +88,27 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --disable-multilib \ - --disable-gprofng \ - --enable-ld=default \ - $_gold_configure \ - --enable-64-bit-bfd \ - $_plugin_configure \ - --enable-relro \ - --enable-deterministic-archives \ - --enable-default-execstack=no \ - $_cross_configure \ + --sysconfdir=/etc \ $_arch_configure \ - --enable-default-hash-style=gnu \ - --with-pic \ - --disable-werror \ + $_cross_configure \ + $_gold_configure \ + $_plugin_configure \ + --disable-gprofng \ + --disable-multilib \ --disable-nls \ + --disable-werror \ + --enable-64-bit-bfd \ + --enable-colored-disassembly \ + --enable-default-execstack=no \ + --enable-default-hash-style=gnu \ + --enable-deterministic-archives \ + --enable-ld=default \ + --enable-new-dtags \ + --enable-relro \ + --enable-threads \ + --with-bugurl="https://postmarketos.org/issues" \ --with-mmap \ + --with-pic \ --with-system-zlib make } diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD index e9b51af0b..6222bc4f6 100644 --- a/cross/binutils-armhf/APKBUILD +++ b/cross/binutils-armhf/APKBUILD @@ -8,11 +8,11 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-armhf pkgver=2.40 -pkgrel=7 +pkgrel=8 pkgdesc="Tools necessary to build programs for armhf targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" -makedepends_host="zlib-dev zstd-dev" +makedepends_host="zlib-dev jansson-dev zstd-dev" makedepends="$makedepends_build $makedepends_host" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause" @@ -23,6 +23,10 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz " builddir="$srcdir/binutils-$pkgver" +if [ -z "$BOOTSTRAP" ]; then + makedepends_host="$makedepends_host jansson-dev zstd-dev" +fi + if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then subpackages="$subpackages binutils-gold" fi @@ -84,22 +88,27 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --disable-multilib \ - --disable-gprofng \ - --enable-ld=default \ - $_gold_configure \ - --enable-64-bit-bfd \ - $_plugin_configure \ - --enable-relro \ - --enable-deterministic-archives \ - --enable-default-execstack=no \ - $_cross_configure \ + --sysconfdir=/etc \ $_arch_configure \ - --enable-default-hash-style=gnu \ - --with-pic \ - --disable-werror \ + $_cross_configure \ + $_gold_configure \ + $_plugin_configure \ + --disable-gprofng \ + --disable-multilib \ --disable-nls \ + --disable-werror \ + --enable-64-bit-bfd \ + --enable-colored-disassembly \ + --enable-default-execstack=no \ + --enable-default-hash-style=gnu \ + --enable-deterministic-archives \ + --enable-ld=default \ + --enable-new-dtags \ + --enable-relro \ + --enable-threads \ + --with-bugurl="https://postmarketos.org/issues" \ --with-mmap \ + --with-pic \ --with-system-zlib make } diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD index 336eee41e..62d6400fc 100644 --- a/cross/binutils-armv7/APKBUILD +++ b/cross/binutils-armv7/APKBUILD @@ -8,11 +8,11 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-armv7 pkgver=2.40 -pkgrel=7 +pkgrel=8 pkgdesc="Tools necessary to build programs for armv7 targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" -makedepends_host="zlib-dev zstd-dev" +makedepends_host="zlib-dev jansson-dev zstd-dev" makedepends="$makedepends_build $makedepends_host" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause" @@ -23,6 +23,10 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz " builddir="$srcdir/binutils-$pkgver" +if [ -z "$BOOTSTRAP" ]; then + makedepends_host="$makedepends_host jansson-dev zstd-dev" +fi + if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then subpackages="$subpackages binutils-gold" fi @@ -84,22 +88,27 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --disable-multilib \ - --disable-gprofng \ - --enable-ld=default \ - $_gold_configure \ - --enable-64-bit-bfd \ - $_plugin_configure \ - --enable-relro \ - --enable-deterministic-archives \ - --enable-default-execstack=no \ - $_cross_configure \ + --sysconfdir=/etc \ $_arch_configure \ - --enable-default-hash-style=gnu \ - --with-pic \ - --disable-werror \ + $_cross_configure \ + $_gold_configure \ + $_plugin_configure \ + --disable-gprofng \ + --disable-multilib \ --disable-nls \ + --disable-werror \ + --enable-64-bit-bfd \ + --enable-colored-disassembly \ + --enable-default-execstack=no \ + --enable-default-hash-style=gnu \ + --enable-deterministic-archives \ + --enable-ld=default \ + --enable-new-dtags \ + --enable-relro \ + --enable-threads \ + --with-bugurl="https://postmarketos.org/issues" \ --with-mmap \ + --with-pic \ --with-system-zlib make } diff --git a/cross/binutils-riscv64/APKBUILD b/cross/binutils-riscv64/APKBUILD index 60e97b926..3a7f389b1 100644 --- a/cross/binutils-riscv64/APKBUILD +++ b/cross/binutils-riscv64/APKBUILD @@ -8,11 +8,11 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)" pkgname=binutils-riscv64 pkgver=2.40 -pkgrel=7 +pkgrel=8 pkgdesc="Tools necessary to build programs for riscv64 targets" url="https://www.gnu.org/software/binutils/" makedepends_build="bison flex texinfo" -makedepends_host="zlib-dev zstd-dev" +makedepends_host="zlib-dev jansson-dev zstd-dev" makedepends="$makedepends_build $makedepends_host" arch="x86_64" license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause" @@ -23,6 +23,10 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz " builddir="$srcdir/binutils-$pkgver" +if [ -z "$BOOTSTRAP" ]; then + makedepends_host="$makedepends_host jansson-dev zstd-dev" +fi + if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then subpackages="$subpackages binutils-gold" fi @@ -84,22 +88,27 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --disable-multilib \ - --disable-gprofng \ - --enable-ld=default \ - $_gold_configure \ - --enable-64-bit-bfd \ - $_plugin_configure \ - --enable-relro \ - --enable-deterministic-archives \ - --enable-default-execstack=no \ - $_cross_configure \ + --sysconfdir=/etc \ $_arch_configure \ - --enable-default-hash-style=gnu \ - --with-pic \ - --disable-werror \ + $_cross_configure \ + $_gold_configure \ + $_plugin_configure \ + --disable-gprofng \ + --disable-multilib \ --disable-nls \ + --disable-werror \ + --enable-64-bit-bfd \ + --enable-colored-disassembly \ + --enable-default-execstack=no \ + --enable-default-hash-style=gnu \ + --enable-deterministic-archives \ + --enable-ld=default \ + --enable-new-dtags \ + --enable-relro \ + --enable-threads \ + --with-bugurl="https://postmarketos.org/issues" \ --with-mmap \ + --with-pic \ --with-system-zlib make }