jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cross-i686-linux-musl: remove stack_chk_fail_local patch

Browse source 
and add libssp-musl.patch

[ci skip]
This commit is contained in:
Jürgen Buchmüller 2020-06-06 16:28:36 +02:00 committed by q66
parent a26e63041a
commit 9b6a16530a
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/cross-i686-linux-musl/files/libssp-musl.patch Symbolic link
View file

@ -0,0 +1 @@
../../gcc/files/libssp-musl.patch

1
srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch
View file

@ -1 +0,0 @@
../../gcc/patches/no-stack_chk_fail_local.patch

12
srcpkgs/cross-i686-linux-musl/template
View file

@ -12,9 +12,9 @@ _archflags="-march=i686"
pkgname=cross-${_triplet}
version=0.33
revision=1
revision=2
short_desc="Cross toolchain for i686 target (musl)"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
homepage="https://www.voidlinux.org/"
license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
distfiles="
@ -89,9 +89,9 @@ _gcc_bootstrap() {
cd ${wrksrc}/gcc-${_gcc_version}
_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
_apply_patch -p0 ${FILESDIR}/musl-ada.patch
_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
@ -100,9 +100,9 @@ _gcc_bootstrap() {
[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
cd ../gcc-bootstrap
_args=--prefix=/usr \
_args+=" --target=${_triplet}"
_args="--target=${_triplet}"
_args+=" --with-sysroot=${_sysroot}"
_args+=" --prefix=/usr"
_args+=" --enable-languages=c"
_args+=" --with-newlib"
_args+=" --disable-nls"
@ -192,6 +192,7 @@ _gcc_build() {
_args="--target=${_triplet}"
_args+=" --with-sysroot=${_sysroot}"
_args+=" --prefix=/usr"
_args+=" --libexecdir=/usr/lib"
_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
_args+=" --enable-lto"
_args+=" --enable-default-pie"
@ -200,6 +201,7 @@ _gcc_build() {
_args+=" --disable-multilib"
_args+=" --disable-libmpx"
_args+=" --disable-libmudflap"
_args+=" --enable-libssp"
_args+=" --enable-libada"
_args+=" --enable-libquadmath"
_args+=" --enable-shared"