* [PR PATCH] Revert "build-style/void-cross: always enable libssp"
@ 2022-12-21 23:21 oreo639
2022-12-22 1:33 ` [PR PATCH] [Updated] " oreo639
` (19 more replies)
0 siblings, 20 replies; 21+ messages in thread
From: oreo639 @ 2022-12-21 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2522 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229
Revert "build-style/void-cross: always enable libssp"
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Fixes the following build failure for qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
The issue didn't crop up until now because the glibc cross-compilers were never rebuilt until the gcc 12 update.
[ci skip]
<!--
#### 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/41229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vcross-41229.patch --]
[-- Type: text/x-diff, Size: 9713 bytes --]
From 0a3b4ef8921d960a4b28fbaf3bc331f53903d5b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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 <oreo6391@gmail.com>
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
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
@ 2022-12-22 1:33 ` oreo639
2022-12-26 4:03 ` CameronNemo
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-22 1:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2778 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229
Revert "build-style/void-cross: always enable libssp"
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This fixes a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
The issue didn't crop up until now because the glibc cross-compilers were never rebuilt until the gcc 12 update.
cross-vpkg-dummy still only provides libssp conditionally so it should be fine:
https://github.com/void-linux/void-packages/blob/master/srcpkgs/cross-vpkg-dummy/template#L66
[ci skip]
<!--
#### 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/41229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vcross-41229.patch --]
[-- Type: text/x-diff, Size: 9703 bytes --]
From 0a3b4ef8921d960a4b28fbaf3bc331f53903d5b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 86276ad41c576b1cfab8ab98cad486251b16f628 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:52 -0800
Subject: [PATCH 02/11] cross-aarch64-linux-gnu: rebuild for libssp
---
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 3122446c1be84bdca182d1cc69af0cc03e843ede Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:52 -0800
Subject: [PATCH 03/11] cross-arm-linux-gnueabi: rebuild for libssp
---
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 59a5578ab80e0a94670688b6f577e4553d21f947 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:52 -0800
Subject: [PATCH 04/11] cross-arm-linux-gnueabihf: rebuild for libssp
---
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 b54ee5d7c9ced8110411bd9896bdab0313dc9c7d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:52 -0800
Subject: [PATCH 05/11] cross-armv7l-linux-gnueabihf: rebuild for libssp
---
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 351c019826fa40cd4bac647625d3974412b77b7d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:52 -0800
Subject: [PATCH 06/11] cross-i686-pc-linux-gnu: rebuild for libssp
---
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 2507b584129edf7c2cbe61d10f8757253f6e4c96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:52 -0800
Subject: [PATCH 07/11] cross-powerpc-linux-gnu: rebuild for libssp
---
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 430d1b470465b34b1fd10edca8ba23441223ff39 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:53 -0800
Subject: [PATCH 08/11] cross-powerpc64-linux-gnu: rebuild for libssp
---
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 6467fa55adfbb68ad8c2d4415a5ab2f089de1c32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:53 -0800
Subject: [PATCH 09/11] cross-powerpc64le-linux-gnu: rebuild for libssp
---
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 42392ce17a037aa6123120b0eecc995327acbf85 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:53 -0800
Subject: [PATCH 10/11] cross-powerpcle-linux-gnu: rebuild for libssp
---
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 1687c4dfa571def8aedb21024cb988925e31faa3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 17:32:53 -0800
Subject: [PATCH 11/11] cross-x86_64-linux-gnu: rebuild for libssp
---
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
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
2022-12-22 1:33 ` [PR PATCH] [Updated] " oreo639
@ 2022-12-26 4:03 ` CameronNemo
2022-12-26 5:03 ` oreo639
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: CameronNemo @ 2022-12-26 4:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364857672
Comment:
@oreo639 could this use further testing, and if so, how?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
2022-12-22 1:33 ` [PR PATCH] [Updated] " oreo639
2022-12-26 4:03 ` CameronNemo
@ 2022-12-26 5:03 ` oreo639
2022-12-26 5:04 ` oreo639
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so should still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (they should still pull in the libssp package iirc).
If there is something I missed please let me know.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (2 preceding siblings ...)
2022-12-26 5:03 ` oreo639
@ 2022-12-26 5:04 ` oreo639
2022-12-26 5:04 ` oreo639
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 5:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (they should still pull in the libssp package iirc).
If there is something I missed please let me know.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (3 preceding siblings ...)
2022-12-26 5:04 ` oreo639
@ 2022-12-26 5:04 ` oreo639
2022-12-26 5:05 ` oreo639
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 5:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (packages depending on libssp should still pull in the libssp package iirc).
If there is something I missed please let me know.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (4 preceding siblings ...)
2022-12-26 5:04 ` oreo639
@ 2022-12-26 5:05 ` oreo639
2022-12-26 5:06 ` oreo639
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 5:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (packages depending on libssp should still pull in the libssp package iirc).
If there is something I missed please let me know.
The other gcc PR will need testing to make sure that the arm/aarch64 packages still compile fine. (I still need to revbump everything)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (5 preceding siblings ...)
2022-12-26 5:05 ` oreo639
@ 2022-12-26 5:06 ` oreo639
2022-12-26 5:19 ` oreo639
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 5:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 607 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (packages depending on libssp should still pull in the libssp package iirc).
If there is something I missed please let me know.
The other gcc PR (#41294) will need testing to make sure that the arm/aarch64 packages still compile fine. (I still need to revbump everything)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (6 preceding siblings ...)
2022-12-26 5:06 ` oreo639
@ 2022-12-26 5:19 ` oreo639
2022-12-26 7:46 ` oreo639
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 5:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (packages depending on libssp should still pull in the libssp package iirc).
If there is something I missed please let me know.
The other gcc PR (#41294) will need testing to make sure that the arm/aarch64 packages still compile fine and that everything gets rebuilt. (I still need to revbump everything)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (7 preceding siblings ...)
2022-12-26 5:19 ` oreo639
@ 2022-12-26 7:46 ` oreo639
2022-12-26 9:37 ` oreo639
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 7:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 677 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (packages depending on libssp should still pull in the libssp package iirc).
If there is something I missed please let me know.
The other gcc PR (#41294) will definitely need testing to make sure that the arm/aarch64 packages still compile fine and to make sure I didn't miss anything. (There are still things I haven't revbumped yet though)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (8 preceding siblings ...)
2022-12-26 7:46 ` oreo639
@ 2022-12-26 9:37 ` oreo639
2022-12-27 10:21 ` [PR PATCH] [Updated] " oreo639
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-26 9:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package and libssp.so was never added to cross-vpkg-dummy so it shouldn't break anything that wasn't already broken (packages depending on libssp should still pull in the libssp package iirc).
If there is something I missed please let me know.
The other gcc PR (#41294) will definitely need testing to make sure that the arm/aarch64 packages still compile fine and to make sure I didn't miss anything.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] Revert "build-style/void-cross: always enable libssp"
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (9 preceding siblings ...)
2022-12-26 9:37 ` oreo639
@ 2022-12-27 10:21 ` oreo639
2022-12-27 10:21 ` Drop libssp from cross compilers oreo639
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-27 10:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3515 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229
Revert "build-style/void-cross: always enable libssp"
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This fixes an issue introduced by: https://github.com/void-linux/void-packages/commit/b2d670be60b883192d12f79077fa79dff5395554 that was not noticed until now as the glibc cross compilers were never rebuilt until recently.
The above commit caused a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
cross-vpkg-dummy still only provides libssp conditionally so it should be fine:
https://github.com/void-linux/void-packages/blob/master/srcpkgs/cross-vpkg-dummy/template#L66
Note: this doesn't affect the ability to use ssp as glibc has its own ssp implementation separate from libssp.
For reference Debian doesn't build libssp although it does manually create libssp_nonshared.a when compiling for musl, Alpine does the same thing: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules2#L233 https://github.com/alpinelinux/aports/blob/6cdeaa93fe90cccc05e39fb4905dee70362892b8/main/musl/APKBUILD#L51-L53 Fedora afaict does build libssp but deletes libssp and libssp_nonshared after compiling: https://src.fedoraproject.org/rpms/gcc/blob/rawhide/f/gcc.spec#_1996
[ci skip]
<!--
#### 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/41229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vcross-41229.patch --]
[-- Type: text/x-diff, Size: 23094 bytes --]
From 7dc2c35f1516c4ffc54419ee25801b970742b3d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 15:09:53 -0800
Subject: [PATCH 01/26] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..cb62d17ac59e 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -385,6 +391,7 @@ _void_cross_build_gcc() {
extra_args+=" --disable-gnu-unique-object"
extra_args+=" libat_cv_have_ifunc=no"
else
+ extra_args+=" "
extra_args+=" --enable-clocale=gnu"
extra_args+=" --enable-gnu-unique-object"
fi
@@ -417,6 +424,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +433,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 \
@@ -600,6 +607,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 7717cc9ebdbc1116259dc3cc43132799198d9eaa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:18:16 -0800
Subject: [PATCH 02/26] cross-vpkg-dummy: drop libssp from musl cross compilers
---
srcpkgs/cross-vpkg-dummy/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..1ad200d699c0 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From b0955ebfeb664e1689150458d9b47e34c0b2480d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 03/26] cross-aarch64-linux-gnu: drop libssp from cross
compilers
---
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 e6ddd9d7e40e68491bf55a75c26f0fd9b3f6e330 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 04/26] cross-aarch64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 59ce6bd360f02e7a97c62ead4f6c8622f9c7729e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 05/26] cross-arm-linux-gnueabi: drop libssp from cross
compilers
---
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 b5cff5ef6adee25bedcccb872e5c86846c2bdc29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 06/26] cross-arm-linux-gnueabihf: drop libssp from cross
compilers
---
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 fd938815aca62afe5a35d1181d4d65ff20a20b33 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 07/26] cross-arm-linux-musleabi: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-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"
From 51cffaa9890d44596cf5190c02fdef1db39d7be4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 08/26] cross-arm-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-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"
From 0eb5da80812b9ce8e288fc6334cd8835ffce7973 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 09/26] cross-armv7l-linux-gnueabihf: drop libssp from cross
compilers
---
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 97f76e6a8e273c6c80ef3ffb67bca3ee271f96eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 10/26] cross-armv7l-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-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"
From ab3971d26c2bfb346c71cb87ba232c0d9e1f7d80 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 11/26] cross-i686-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0858b77a212b404904ca7e9cd5937255321f9e91 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 12/26] cross-i686-pc-linux-gnu: drop libssp from cross
compilers
---
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 0c41d3bdb8e22f24ae4fd0d6552452e1694e9ac7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 13/26] cross-mips-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 8d2ac0b7bd2b92b030d7cbb25775fd9a9971be3c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 14/26] cross-mips-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From d21f9bb082a7a25883beff7a5f3f7ae478208dbe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 15/26] cross-mipsel-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 57b4e859802750580ec42c7e38d20ae8c0dca60e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 16/26] cross-mipsel-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From ec02157668659de93578dc4af6ee03b048e8c91e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 17/26] cross-powerpc-linux-gnu: drop libssp from cross
compilers
---
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 596c41875352a49929c6bf2ccec3deee5108f351 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 18/26] cross-powerpc-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 713e16538e8efe4538db160712fd66293f136c9e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 19/26] cross-powerpc64-linux-gnu: drop libssp from cross
compilers
---
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 5097cf751c1d9ea8cdaffe4f478d6becbfb47181 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 20/26] cross-powerpc64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From ad09e397359c21be1ae65d89a57eb8697f97465b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 21/26] cross-powerpc64le-linux-gnu: drop libssp from cross
compilers
---
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 b79df9904f614570b838541722148afbfa79067a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 22/26] cross-powerpc64le-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 792de16db74b532bb9c68d27b1454e03fce6b64d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 23/26] cross-powerpcle-linux-gnu: drop libssp from cross
compilers
---
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 7b6bfde839f95aad4252b7cf93c6b9ccd6092034 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 24/26] cross-powerpcle-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 96d0903a32669ef1f8001972e963ca5af1e9c482 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 25/26] cross-x86_64-linux-gnu: drop libssp from cross
compilers
---
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
From 0c3d7436968ada7d4ca84cc2e11762fc5b72df79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 26/26] cross-x86_64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (10 preceding siblings ...)
2022-12-27 10:21 ` [PR PATCH] [Updated] " oreo639
@ 2022-12-27 10:21 ` oreo639
2022-12-27 10:27 ` [PR PATCH] [Updated] " oreo639
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-27 10:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
Not that I am aware of.
libssp.so will still be provided by the libssp package so any packages depending on it will still work.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (11 preceding siblings ...)
2022-12-27 10:21 ` Drop libssp from cross compilers oreo639
@ 2022-12-27 10:27 ` oreo639
2022-12-27 10:35 ` oreo639
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-27 10:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3329 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229
Drop libssp from cross compilers
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This fixes an issue introduced by: https://github.com/void-linux/void-packages/commit/b2d670be60b883192d12f79077fa79dff5395554 that was not noticed until now as the glibc cross compilers were never rebuilt until recently.
The above commit caused a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
Note: this doesn't affect the ability to use ssp as glibc and musl have their own ssp implementations separate from libssp.
For reference Debian doesn't build libssp although it does manually create libssp_nonshared.a when compiling for musl, Alpine does the same thing: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules2#L233 https://github.com/alpinelinux/aports/blob/6cdeaa93fe90cccc05e39fb4905dee70362892b8/main/musl/APKBUILD#L51-L53 Fedora afaict does build libssp but deletes libssp and libssp_nonshared after compiling: https://src.fedoraproject.org/rpms/gcc/blob/rawhide/f/gcc.spec#_1996
[ci skip]
<!--
#### 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/41229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vcross-41229.patch --]
[-- Type: text/x-diff, Size: 23904 bytes --]
From 7dc2c35f1516c4ffc54419ee25801b970742b3d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 15:09:53 -0800
Subject: [PATCH 01/27] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..cb62d17ac59e 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -385,6 +391,7 @@ _void_cross_build_gcc() {
extra_args+=" --disable-gnu-unique-object"
extra_args+=" libat_cv_have_ifunc=no"
else
+ extra_args+=" "
extra_args+=" --enable-clocale=gnu"
extra_args+=" --enable-gnu-unique-object"
fi
@@ -417,6 +424,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +433,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 \
@@ -600,6 +607,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 8831bcfcf59ed2c11944b914480836cb0ff80315 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:26:14 -0800
Subject: [PATCH 02/27] musl: add __stack_chk_fail_local
This is necessary for libssp_nonshared.a (only build for cross
compilers for now)
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
From 35a6428e5e7e575be55d035b8ba97c3bdd493041 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:18:16 -0800
Subject: [PATCH 03/27] cross-vpkg-dummy: drop libssp from musl cross compilers
---
srcpkgs/cross-vpkg-dummy/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..1ad200d699c0 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From f2bca1dd7085d025133b0edc43dee05b7937225e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 04/27] cross-aarch64-linux-gnu: drop libssp from cross
compilers
---
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 61d5692af02fdf07a90a8ceb5a1502a59024af26 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 05/27] cross-aarch64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 797fef11b559409180fcd76ecbf4e4702668ead0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 06/27] cross-arm-linux-gnueabi: drop libssp from cross
compilers
---
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 0ce7c48b29f14a3629e58d85946a56dda4fc08e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 07/27] cross-arm-linux-gnueabihf: drop libssp from cross
compilers
---
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 f6096ab807b84fbb9d9b861f3e2e12c9fbeafdf1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 08/27] cross-arm-linux-musleabi: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-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"
From 8c8a037f9a1b5487cd4351166c2dcb8ba38d29c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 09/27] cross-arm-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-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"
From 660f67d2b8d790b8ef7a4516887fff181f998244 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 10/27] cross-armv7l-linux-gnueabihf: drop libssp from cross
compilers
---
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 6b091f75606cbf4d59bb66c335b575368d2c3621 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 11/27] cross-armv7l-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-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"
From b65fd1cc0270e95ab8caa52d96b4e58a11167532 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 12/27] cross-i686-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 12f7830bff3cecb8961f987c0502f75171f8509d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 13/27] cross-i686-pc-linux-gnu: drop libssp from cross
compilers
---
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 a65b0455a7eac8b0344ae863e923691d288b2bb1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 14/27] cross-mips-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 0e897fcee56a5b03cc2057530e9097e340b5d336 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 15/27] cross-mips-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From a65eef3200c8d656d503fc1cfce6df2ee2752633 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 16/27] cross-mipsel-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 3b8c5f5873ec4c53243e9a354b7584af3728cb72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 17/27] cross-mipsel-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 0d2e98737decb67c041f863d3b163bc4b7d3223e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 18/27] cross-powerpc-linux-gnu: drop libssp from cross
compilers
---
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 be7bc474efa608805aa127ea3aa287cca8420686 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 19/27] cross-powerpc-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 24f780410bfe123938165230158500d736cba50d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 20/27] cross-powerpc64-linux-gnu: drop libssp from cross
compilers
---
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 47dbd7dbab658446722004005eda1c2827186083 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 21/27] cross-powerpc64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 864e0245ae1ce582c28c8c18ff4fbebedc58cedf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 22/27] cross-powerpc64le-linux-gnu: drop libssp from cross
compilers
---
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 9442fb4c815d4f553752e7ac2038aa8ff06d8434 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 23/27] cross-powerpc64le-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 41b59950362a2ab596d06eb6bae3b6def19a273a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 24/27] cross-powerpcle-linux-gnu: drop libssp from cross
compilers
---
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 db01a3d7727c7d6f52b59c6c3dca0e23c7fb5366 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 25/27] cross-powerpcle-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e5715ad36687e8119137ec949225ff8177bcdd12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 26/27] cross-x86_64-linux-gnu: drop libssp from cross
compilers
---
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
From 059f88921347c385b2d5c9ca8286a5bbfaea9c08 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 27/27] cross-x86_64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (12 preceding siblings ...)
2022-12-27 10:27 ` [PR PATCH] [Updated] " oreo639
@ 2022-12-27 10:35 ` oreo639
2022-12-27 10:55 ` oreo639
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-27 10:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3570 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229
Drop libssp from cross compilers
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
NOTE: This is part 1 of a two part PR, for the other half, see: https://github.com/void-linux/void-packages/pull/41294
This fixes an issue introduced by: https://github.com/void-linux/void-packages/commit/b2d670be60b883192d12f79077fa79dff5395554 that was not noticed until now as the glibc cross compilers were never rebuilt until recently.
The above commit caused a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
Note: this doesn't affect the ability to use ssp as glibc and musl have their own ssp implementations separate from libssp.
For reference Debian doesn't build libssp although it does manually create libssp_nonshared.a when compiling for musl, Alpine does the same thing: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules2#L233 https://github.com/alpinelinux/aports/blob/6cdeaa93fe90cccc05e39fb4905dee70362892b8/main/musl/APKBUILD#L51-L53 Fedora afaict does build libssp but deletes libssp and libssp_nonshared after compiling: https://src.fedoraproject.org/rpms/gcc/blob/rawhide/f/gcc.spec#_1996
This also doesn't break packages linked against libssp as libssp.so is still provided by the libssp package in gcc.
[ci skip]
<!--
#### 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/41229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vcross-41229.patch --]
[-- Type: text/x-diff, Size: 23654 bytes --]
From 38483389c11e12fc9273fc5f5177b48a1f5da8b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 15:09:53 -0800
Subject: [PATCH 01/27] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,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 \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From ae2399f92a4b67c83242fba23dd3a571349b4ea8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:26:14 -0800
Subject: [PATCH 02/27] musl: add __stack_chk_fail_local
This is necessary for libssp_nonshared.a (only build for cross
compilers for now)
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
From 2245a7eff64c90f92053942d99c285b715cf1d47 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:18:16 -0800
Subject: [PATCH 03/27] cross-vpkg-dummy: drop libssp from musl cross compilers
---
srcpkgs/cross-vpkg-dummy/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..1ad200d699c0 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 5af3bed8f4bfd3fb3f9ad5b580492f8e94500eb2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 04/27] cross-aarch64-linux-gnu: drop libssp from cross
compilers
---
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 4edc4722900b782429b1f4c63d1a632e2f32265b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 05/27] cross-aarch64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 22a0e7aec35a74801feb87d34a4e61ef656348fc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 06/27] cross-arm-linux-gnueabi: drop libssp from cross
compilers
---
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 29ac2abd24a2ed4002c1e18482938c953a29c51d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 07/27] cross-arm-linux-gnueabihf: drop libssp from cross
compilers
---
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 4672b2eece37dac55e9da0565ccb8d6a7555961d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 08/27] cross-arm-linux-musleabi: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-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"
From d4ad100703926064e3892eed918e364ee9086588 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 09/27] cross-arm-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-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"
From 0e48545293c845d5bedb4ca13b532c1ab1be1689 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 10/27] cross-armv7l-linux-gnueabihf: drop libssp from cross
compilers
---
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 e0d50f507a030a051a01d1aa6f6f75511f4a0ed0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 11/27] cross-armv7l-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-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"
From b3c118636b7217a1e8e8558a7774870dd5c4749c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 12/27] cross-i686-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From b85587fb8a03b0b726acc10ac37636400058d25e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 13/27] cross-i686-pc-linux-gnu: drop libssp from cross
compilers
---
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 4f2e7fe0c0a828bc143e32f67732a85ac5daeb81 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 14/27] cross-mips-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 15c8855c40caaa2ad2aa4b2c87d22e46d8e5b897 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 15/27] cross-mips-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c41ad9e737b50326b423f111dc709446cc0b4353 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 16/27] cross-mipsel-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From ed2f67703fa8eed539a6dfaa683b926591612a96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 17/27] cross-mipsel-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 288f248cfa4c104f0c001f7a2eca5864fb664f34 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 18/27] cross-powerpc-linux-gnu: drop libssp from cross
compilers
---
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 a7f97f3ace26785f796ae0f3b0b98b59fd61b1db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 19/27] cross-powerpc-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From f0ad79e777def3fd5c773752ec901df9aa2fa6b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 20/27] cross-powerpc64-linux-gnu: drop libssp from cross
compilers
---
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 e60d319fec81f087b6ef422cd30d829848ef55bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 21/27] cross-powerpc64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From a749aaffa9d33c9fefde356b1b6f3319eac8f31b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 22/27] cross-powerpc64le-linux-gnu: drop libssp from cross
compilers
---
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 c446a49b6f9f5a56082f431d779080f2978d6f83 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 23/27] cross-powerpc64le-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 4b23e52c16d35e4a706043d8faa74de085d8f365 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 24/27] cross-powerpcle-linux-gnu: drop libssp from cross
compilers
---
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 b012f45105b8bcb353547b04c360addec7527107 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 25/27] cross-powerpcle-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 644102fcb4b31b21a5748faa7e72310fa8a87373 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 26/27] cross-x86_64-linux-gnu: drop libssp from cross
compilers
---
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
From 1abb3304956297e3b2c37b4c8ec2b889096572ba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 27/27] cross-x86_64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (13 preceding siblings ...)
2022-12-27 10:35 ` oreo639
@ 2022-12-27 10:55 ` oreo639
2022-12-27 10:56 ` oreo639
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-27 10:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
For this pr? Not that I am aware of.
libssp.so will still be provided by the libssp package so any packages depending on it will still work.
There is https://github.com/void-linux/void-packages/pull/41294 which can benefit from more testing (to make sure everything builds, I didn't miss something, or some revbump doesn't get disapeared by a rebase)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (14 preceding siblings ...)
2022-12-27 10:55 ` oreo639
@ 2022-12-27 10:56 ` oreo639
2022-12-27 12:14 ` [PR PATCH] [Updated] " oreo639
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-27 10:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
For this pr? Not that I am aware of.
libssp.so will still be provided by the libssp package so any packages depending on it will still work.
There is https://github.com/void-linux/void-packages/pull/41294 which can benefit from more testing (to make sure everything builds, I didn't miss something, or make sure some revbump doesn't get disapeared by a rebase)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (15 preceding siblings ...)
2022-12-27 10:56 ` oreo639
@ 2022-12-27 12:14 ` oreo639
2023-01-09 8:32 ` oreo639
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2022-12-27 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3651 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229
Drop libssp from cross compilers
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
NOTE: This is part 1 of a two part PR, for the other half, see: https://github.com/void-linux/void-packages/pull/41294 (this PR should work fine without the second part, but not the other way around)
This fixes an issue introduced by: https://github.com/void-linux/void-packages/commit/b2d670be60b883192d12f79077fa79dff5395554 that was not noticed until now as the glibc cross compilers were never rebuilt until recently.
The above commit caused a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
Note: this doesn't affect the ability to use ssp as glibc and musl have their own ssp implementations separate from libssp.
For reference Debian doesn't build libssp although it does manually create libssp_nonshared.a when compiling for musl, Alpine does the same thing: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules2#L233 https://github.com/alpinelinux/aports/blob/6cdeaa93fe90cccc05e39fb4905dee70362892b8/main/musl/APKBUILD#L51-L53 Fedora afaict does build libssp but deletes libssp and libssp_nonshared after compiling: https://src.fedoraproject.org/rpms/gcc/blob/rawhide/f/gcc.spec#_1996
This also doesn't break packages linked against libssp as libssp.so is still provided by the libssp package in gcc.
[ci skip]
<!--
#### 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/41229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vcross-41229.patch --]
[-- Type: text/x-diff, Size: 23927 bytes --]
From 3f3fefadfefaa59a5ddc684dd27e50b6fa97bbdb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 15:09:53 -0800
Subject: [PATCH 01/27] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,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 \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From dd325464662527fb7cfc930798c8379b3ecfc9c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:26:14 -0800
Subject: [PATCH 02/27] musl: add __stack_chk_fail_local
This is necessary for libssp_nonshared.a (only build for cross
compilers for now)
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
From 2cf0006554ebecd8b2a090aa77cb7b614ee9463f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:18:16 -0800
Subject: [PATCH 03/27] cross-vpkg-dummy: drop libssp from musl cross compilers
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 91d67d59e87acc31d3a32e5f74b5b6e2c71ed7e0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 04/27] cross-aarch64-linux-gnu: drop libssp from cross
compilers
---
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 2081b7e612227cc82457ddedca5a17f400564232 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 05/27] cross-aarch64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fcded951e14f4021fff7a3aaf7d09ebf761b651e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 06/27] cross-arm-linux-gnueabi: drop libssp from cross
compilers
---
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 d22a8097368d5bc2527585eeba76e43066267e2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 07/27] cross-arm-linux-gnueabihf: drop libssp from cross
compilers
---
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 e1b9676957b1c2fea80bd2a1a34623eb7652f16f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 08/27] cross-arm-linux-musleabi: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-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"
From 9a617f4c520ed82bc1bcaba92338eef8a2f26145 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 09/27] cross-arm-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-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"
From 1c6d97864a987000e300cdb31563cd665bc819a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 10/27] cross-armv7l-linux-gnueabihf: drop libssp from cross
compilers
---
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 32d324c2612a0f2728c8a77b8b256f14b97c1035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 11/27] cross-armv7l-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-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"
From a00e77cfaecf35d3404c85555259eb50dcad3aef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 12/27] cross-i686-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0237da4cbb30985bd5411e99c91bde60026fb8da Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 13/27] cross-i686-pc-linux-gnu: drop libssp from cross
compilers
---
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 d289452b55fc711b7fee3210bcb18a02242e7b33 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 14/27] cross-mips-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 5de6b2ba7df494852c75fcf196c6623a923f8764 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 15/27] cross-mips-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From fe1396e32ee6a8c5de2e981701f1dd79e8b81f85 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 16/27] cross-mipsel-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 8bd80f7b2f1b5422c8244ec1dd91e7c3cd38bf57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 17/27] cross-mipsel-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 72310c38424129998ecb7cb52c7b5cf81b8fc313 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 18/27] cross-powerpc-linux-gnu: drop libssp from cross
compilers
---
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 bba1d89f75fe7c0216412c28e57208eba893402a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 19/27] cross-powerpc-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From a288a2cb6a0b1191cf7647a351cf631363ab0661 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 20/27] cross-powerpc64-linux-gnu: drop libssp from cross
compilers
---
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 6edb00ccf457a15fb1954966bd19819d85e5e78f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 21/27] cross-powerpc64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 665ff976bfb2d4871913ceee1a4dd29760e86ab2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 22/27] cross-powerpc64le-linux-gnu: drop libssp from cross
compilers
---
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 e0b56afccd46646ed85bc95c8749994d4b4b4ae5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 23/27] cross-powerpc64le-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 687d7b423aad270e3fe3b16e093659a88c2c86a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 24/27] cross-powerpcle-linux-gnu: drop libssp from cross
compilers
---
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 6f28169125a9fa9f0cb4eb5b338bf4459addcc2e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 25/27] cross-powerpcle-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 460ed3c7864d3534fb80f471e9cf2ead044708b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 26/27] cross-x86_64-linux-gnu: drop libssp from cross
compilers
---
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
From a202453ac46d0a490f39a3a16f3469d9bb605127 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 27/27] cross-x86_64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (16 preceding siblings ...)
2022-12-27 12:14 ` [PR PATCH] [Updated] " oreo639
@ 2023-01-09 8:32 ` oreo639
2023-01-09 12:14 ` oreo639
2023-01-20 7:45 ` [PR PATCH] [Closed]: " sgn
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2023-01-09 8:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3481 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229
Drop libssp from cross compilers
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This fixes an issue introduced by: https://github.com/void-linux/void-packages/commit/b2d670be60b883192d12f79077fa79dff5395554 that was not noticed until now as the glibc cross compilers were never rebuilt until recently.
The above commit caused a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
Note: this doesn't affect the ability to use ssp as glibc and musl have their own ssp implementations separate from libssp.
For reference Debian doesn't build libssp although it does manually create libssp_nonshared.a when compiling for musl, Alpine does the same thing: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules2#L233 https://github.com/alpinelinux/aports/blob/6cdeaa93fe90cccc05e39fb4905dee70362892b8/main/musl/APKBUILD#L51-L53 Fedora afaict does build libssp but deletes libssp and libssp_nonshared after compiling: https://src.fedoraproject.org/rpms/gcc/blob/rawhide/f/gcc.spec#_1996
This also doesn't break packages linked against libssp as libssp.so is still provided by the libssp package in gcc. There is a separate PR for that.
[ci skip]
<!--
#### 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/41229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vcross-41229.patch --]
[-- Type: text/x-diff, Size: 23927 bytes --]
From f9ec401d06447cbe7357204d998b53062eaa4e1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 15:09:53 -0800
Subject: [PATCH 01/27] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,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 \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 77c7a7a8306040b0f76953b8988c88ee7018a4a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:26:14 -0800
Subject: [PATCH 02/27] musl: add __stack_chk_fail_local
This is necessary for libssp_nonshared.a (only build for cross
compilers for now)
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
From 18c720360c4b12f79e850ea01a6144589e1406e0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:18:16 -0800
Subject: [PATCH 03/27] cross-vpkg-dummy: drop libssp from musl cross compilers
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From f65fefedc24f4ab4af7cf6ba9e139c9b3b77e99b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 04/27] cross-aarch64-linux-gnu: drop libssp from cross
compilers
---
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 6c12c1ffd656dcb34b781968126c5692c5015ea0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 05/27] cross-aarch64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 9da9226e0cfebf1b6745c6499415ddff4d6fc2c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 06/27] cross-arm-linux-gnueabi: drop libssp from cross
compilers
---
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 516271b2ae98f399b3a49516eea0400310fad153 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 07/27] cross-arm-linux-gnueabihf: drop libssp from cross
compilers
---
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 279de1d49af9d5b5113c27bf0f24dee8281eba96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 08/27] cross-arm-linux-musleabi: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-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"
From 2c7d1c977db2fb94adf3cae8d5ed4449ac7c2c15 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 09/27] cross-arm-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-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"
From 478a1ac54593c817291bae736f1da6a5077e6237 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 10/27] cross-armv7l-linux-gnueabihf: drop libssp from cross
compilers
---
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 7608ec35ac372bc849601a5643d1216028e6863a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 11/27] cross-armv7l-linux-musleabihf: drop libssp from cross
compilers
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-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"
From 5a1584e6d82dc019e785c63756044ae2ae1ac65d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 12/27] cross-i686-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 06460886baed3e566ac6c65497a68403790d4afe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 13/27] cross-i686-pc-linux-gnu: drop libssp from cross
compilers
---
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 f3987f7baee7b31c81526b2124df3a3c79c94ccb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 14/27] cross-mips-linux-musl: drop libssp from cross compilers
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 7b18a84edc1dae500abcd9bc37540db36a2d142d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 15/27] cross-mips-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From d5e71b495a0b0d3d069e414d50f994876d7969d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 16/27] cross-mipsel-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 0db66608574013118551cea2b69bcc68987c2739 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 17/27] cross-mipsel-linux-muslhf: drop libssp from cross
compilers
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 6f57556afcaf32da0ebca62e90c067cbe2a28364 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 18/27] cross-powerpc-linux-gnu: drop libssp from cross
compilers
---
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 675f6a2196cd9f06c78e63674aa412e22669b013 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 19/27] cross-powerpc-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From c23753b39364b1b079b5aaef2bbed0dc8a815db5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 20/27] cross-powerpc64-linux-gnu: drop libssp from cross
compilers
---
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 390e2de28d8aee3133d274bd36e774944dc1b41e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 21/27] cross-powerpc64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 09fee075d4aefd5b41a773f94e7c2f5ca7389f05 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 22/27] cross-powerpc64le-linux-gnu: drop libssp from cross
compilers
---
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 d0c99d3c8d05b51b5f5399cb2c2f06d2ec1dbb99 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 23/27] cross-powerpc64le-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From f9da6ba3ada7f74f6bb130a0814eb0d597867fad Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 24/27] cross-powerpcle-linux-gnu: drop libssp from cross
compilers
---
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 c19fe8772aad68f8e2a4f5cd39478da2be1c2301 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 25/27] cross-powerpcle-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From e42a8b7feb66c9226f941e3fc24183729c3ac0c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 26/27] cross-x86_64-linux-gnu: drop libssp from cross
compilers
---
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
From cf7031a7736794a8df6be1657bfcd4ca650e0c79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 27/27] cross-x86_64-linux-musl: drop libssp from cross
compilers
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (17 preceding siblings ...)
2023-01-09 8:32 ` oreo639
@ 2023-01-09 12:14 ` oreo639
2023-01-20 7:45 ` [PR PATCH] [Closed]: " sgn
19 siblings, 0 replies; 21+ messages in thread
From: oreo639 @ 2023-01-09 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 578 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41229#issuecomment-1364889593
Comment:
For this pr? Not that I am aware of.
libssp.so will still be provided by the libssp package so any packages depending on it will still work.
There is https://github.com/void-linux/void-packages/pull/41294 which can benefit from more testing (to make sure everything builds, I didn't miss something, or make sure some revbump doesn't get disapeared by a rebase)
Feel free to test it anyway and let me know if there are any issues ofc.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Closed]: Drop libssp from cross compilers
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
` (18 preceding siblings ...)
2023-01-09 12:14 ` oreo639
@ 2023-01-20 7:45 ` sgn
19 siblings, 0 replies; 21+ messages in thread
From: sgn @ 2023-01-20 7:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3487 bytes --]
There's a closed pull request on the void-packages repository
Drop libssp from cross compilers
https://github.com/void-linux/void-packages/pull/41229
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This fixes an issue introduced by: https://github.com/void-linux/void-packages/commit/b2d670be60b883192d12f79077fa79dff5395554 that was not noticed until now as the glibc cross compilers were never rebuilt until recently.
The above commit caused a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test
aarch64-linux-gnu-gcc -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```
Note: this doesn't affect the ability to use ssp as glibc and musl have their own ssp implementations separate from libssp.
For reference Debian doesn't build libssp although it does manually create libssp_nonshared.a when compiling for musl, Alpine does the same thing: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules2#L233 https://github.com/alpinelinux/aports/blob/6cdeaa93fe90cccc05e39fb4905dee70362892b8/main/musl/APKBUILD#L51-L53 Fedora afaict does build libssp but deletes libssp and libssp_nonshared after compiling: https://src.fedoraproject.org/rpms/gcc/blob/rawhide/f/gcc.spec#_1996
This also doesn't break packages linked against libssp as libssp.so is still provided by the libssp package in gcc (and there is libatomic which is provided by gcc but not the cross compilers so I don't think it is that crazy). There is a separate PR dropping the libssp package if we want to do that as well.
[ci skip]
<!--
#### 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
-->
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-01-20 7:45 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-21 23:21 [PR PATCH] Revert "build-style/void-cross: always enable libssp" oreo639
2022-12-22 1:33 ` [PR PATCH] [Updated] " oreo639
2022-12-26 4:03 ` CameronNemo
2022-12-26 5:03 ` oreo639
2022-12-26 5:04 ` oreo639
2022-12-26 5:04 ` oreo639
2022-12-26 5:05 ` oreo639
2022-12-26 5:06 ` oreo639
2022-12-26 5:19 ` oreo639
2022-12-26 7:46 ` oreo639
2022-12-26 9:37 ` oreo639
2022-12-27 10:21 ` [PR PATCH] [Updated] " oreo639
2022-12-27 10:21 ` Drop libssp from cross compilers oreo639
2022-12-27 10:27 ` [PR PATCH] [Updated] " oreo639
2022-12-27 10:35 ` oreo639
2022-12-27 10:55 ` oreo639
2022-12-27 10:56 ` oreo639
2022-12-27 12:14 ` [PR PATCH] [Updated] " oreo639
2023-01-09 8:32 ` oreo639
2023-01-09 12:14 ` oreo639
2023-01-20 7:45 ` [PR PATCH] [Closed]: " sgn
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).