From eddc6b1a4e0cc5ef1161250783fe47e3d42a0595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 8 Jun 2020 09:27:04 +0200 Subject: [PATCH] cross-x86_64-linux-musl: add libssp-musl.patch [ci skip] --- srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch | 1 + srcpkgs/cross-x86_64-linux-musl/template | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch diff --git a/srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch new file mode 120000 index 00000000000..37a7489360f --- /dev/null +++ b/srcpkgs/cross-x86_64-linux-musl/files/libssp-musl.patch @@ -0,0 +1 @@ +../../gcc/files/libssp-musl.patch \ No newline at end of file diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 3af7d1c374f..9bd80c4c946 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.33 -revision=2 +revision=3 short_desc="Cross toolchain for x86_64 with musl" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -95,6 +95,7 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.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 @@ -203,6 +204,7 @@ _gcc_build() { _args+=" --enable-lto" _args+=" --enable-default-pie" _args+=" --enable-default-ssp" + _args+=" --enable-libssp" _args+=" --enable-libquadmath" _args+=" --disable-libsanitizer" _args+=" --disable-multilib"