From 0a3b4ef8921d960a4b28fbaf3bc331f53903d5b7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:09:53 -0800 Subject: [PATCH 01/11] Revert "build-style/void-cross: always enable libssp" This reverts commit b2d670be60b883192d12f79077fa79dff5395554. --- common/build-style/void-cross.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 4804193d8395..5e2f57dc1880 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -379,12 +379,14 @@ _void_cross_build_gcc() { local extra_args if [ -f ${wrksrc}/.musl_version ]; then + extra_args+=" --enable-libssp" # otherwise glibc hosts get confused and use the gnu impl extra_args+=" --enable-clocale=generic" extra_args+=" --disable-symvers" extra_args+=" --disable-gnu-unique-object" extra_args+=" libat_cv_have_ifunc=no" else + extra_args+=" --disable-libssp" extra_args+=" --enable-clocale=gnu" extra_args+=" --enable-gnu-unique-object" fi @@ -425,7 +427,6 @@ _void_cross_build_gcc() { --enable-lto \ --enable-default-pie \ --enable-default-ssp \ - --enable-libssp \ --with-gnu-ld \ --with-gnu-as \ --with-linker-hash-style=gnu \ From e98e193455d69c9a1b6c7906561e2ca3b6e69a02 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:33 -0800 Subject: [PATCH 02/11] cross-aarch64-linux-gnu: rebuild for ssp fix --- srcpkgs/cross-aarch64-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index 0aca566f3978..17ba4ec677a6 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-aarch64-linux-gnu version=0.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=armv8-a" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From a32082a66f650f97e3b1e3457028e18476e0c0a5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:33 -0800 Subject: [PATCH 03/11] cross-arm-linux-gnueabi: rebuild for ssp fix --- srcpkgs/cross-arm-linux-gnueabi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index f2d4eabb531d..5aa1383aa8f9 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-arm-linux-gnueabi version=0.35 -revision=2 +revision=3 build_style=void-cross configure_args="--with-arch=armv5te --with-float=soft" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" From cdbc0b6e2dcf7d882858c550984b3f68e969b819 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:33 -0800 Subject: [PATCH 04/11] cross-arm-linux-gnueabihf: rebuild for ssp fix --- srcpkgs/cross-arm-linux-gnueabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index d631c7ca322f..13a780794378 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -6,7 +6,7 @@ _linux_version=5.10.4 _glibc_patchver="72-g0f90d6204d" pkgname=cross-arm-linux-gnueabihf version=0.35 -revision=2 +revision=3 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" From 86f234ec5ed80670785a0ab79ca76f2ea082c7b7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:34 -0800 Subject: [PATCH 05/11] cross-armv7l-linux-gnueabihf: rebuild for ssp fix --- srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index 7daaf852ac9c..ffb71af5b454 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-armv7l-linux-gnueabihf version=0.35 -revision=2 +revision=3 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" From ccc177ca1f8f749e47c096a3813f9c8445ee8fda Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:34 -0800 Subject: [PATCH 06/11] cross-i686-pc-linux-gnu: rebuild for ssp fix --- srcpkgs/cross-i686-pc-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index fd950e0579af..c6f2579c645d 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-i686-pc-linux-gnu version=0.35 -revision=2 +revision=3 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel From 5abfbf6f5a881bcdcb159a60243586a89d4ac64b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:34 -0800 Subject: [PATCH 07/11] cross-powerpc-linux-gnu: rebuild for ssp fix --- srcpkgs/cross-powerpc-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template index 201c1c966678..c759eda4505a 100644 --- a/srcpkgs/cross-powerpc-linux-gnu/template +++ b/srcpkgs/cross-powerpc-linux-gnu/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-powerpc-linux-gnu version=0.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify" hostmakedepends="texinfo tar gcc-objc flex perl python3" From 9172fb4f6715af588d42a0919836cdccbf3e8849 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:34 -0800 Subject: [PATCH 08/11] cross-powerpc64-linux-gnu: rebuild for ssp fix --- srcpkgs/cross-powerpc64-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template index 8f558da423e3..95e6ce653c3d 100644 --- a/srcpkgs/cross-powerpc64-linux-gnu/template +++ b/srcpkgs/cross-powerpc64-linux-gnu/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-powerpc64-linux-gnu version=0.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2 --enable-targets=powerpc-linux" From 18de0bf396d312a8a8b06b63dc1a3d3b1be10dc2 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:34 -0800 Subject: [PATCH 09/11] cross-powerpc64le-linux-gnu: rebuild for ssp fix --- srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template index 5b01d9b65083..f4486e3f229c 100644 --- a/srcpkgs/cross-powerpc64le-linux-gnu/template +++ b/srcpkgs/cross-powerpc64le-linux-gnu/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-powerpc64le-linux-gnu version=0.35 -revision=2 +revision=3 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2 --enable-targets=powerpcle-linux" From a8b45c69f60c4eedb5906351ea7b056d5edf0b3b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:34 -0800 Subject: [PATCH 10/11] cross-powerpcle-linux-gnu: rebuild for ssp fix --- srcpkgs/cross-powerpcle-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template index 687be8a44c6c..32337f1c37cc 100644 --- a/srcpkgs/cross-powerpcle-linux-gnu/template +++ b/srcpkgs/cross-powerpcle-linux-gnu/template @@ -5,7 +5,7 @@ _glibc_version=2.36 _linux_version=5.10.4 pkgname=cross-powerpcle-linux-gnu version=0.35 -revision=1 +revision=2 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify" hostmakedepends="texinfo tar gcc-objc flex perl python3" From 697febb57f3453c121f2cdc42789a1e2493722cc Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 21 Dec 2022 15:18:34 -0800 Subject: [PATCH 11/11] cross-x86_64-linux-gnu: rebuild for ssp fix --- srcpkgs/cross-x86_64-linux-gnu/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template index bdb59d85cdd5..0f6daea7229c 100644 --- a/srcpkgs/cross-x86_64-linux-gnu/template +++ b/srcpkgs/cross-x86_64-linux-gnu/template @@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d" _linux_version=5.10.4 pkgname=cross-x86_64-linux-gnu version=0.35 -revision=2 +revision=3 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel