From 6fa537f2baca5b7ffe1484778a20949514f18770 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 25 Dec 2022 16:11:13 -0800 Subject: [PATCH] gcc: disable libssp --- common/shlibs | 1 - srcpkgs/gcc/template | 26 +++++--------------------- srcpkgs/libssp | 1 - srcpkgs/libssp-devel | 1 - 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 120000 srcpkgs/libssp delete mode 120000 srcpkgs/libssp-devel diff --git a/common/shlibs b/common/shlibs index 504d29f4cb9..e01ca41515b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1 libppl.so.14 ppl-1.2_1 libppl_c.so.4 ppl-0.11_1 libstdc++.so.6 libstdc++-4.4.0_1 -libssp.so.0 libssp-4.4.0_1 libncurses.so.6 ncurses-libs-6.0_1 ignore libncursesw.so.6 ncurses-libs-5.8_1 ignore libtinfo.so.6 ncurses-libtinfo-libs-6.2_2 diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index a20af7c0ef2..7b8bf456ebb 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -4,7 +4,7 @@ pkgname=gcc version=12.2.0 -revision=1 +revision=2 _minorver="${version%.*}" _majorver="${_minorver%.*}" _gmp_version=6.2.1 @@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff nopie=yes lib32disabled=yes bootstrap=yes -replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0" +replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0 + libssp>=0 libssp-devel>=0" _have_gccgo=yes @@ -54,11 +55,10 @@ else fi makedepends="zlib-devel libzstd-devel" depends="binutils libgcc-devel-${version}_${revision} - libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}" + libstdc++-devel-${version}_${revision}" checkdepends="dejagnu" subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel" -subpackages+=" libssp libssp-devel" build_options="ada gnatboot" build_options_default="ada" @@ -290,6 +290,7 @@ do_configure() { _args+=" --with-linker-hash-style=$_hash" _args+=" --disable-sjlj-exceptions" _args+=" --disable-target-libiberty" + _args+=" --disable-libssp" mkdir -p build cd build @@ -683,23 +684,6 @@ libsanitizer_package() { } } -libssp-devel_package() { - depends="libssp>=${_minorver}" - short_desc+=" - SSP (StackSmashingProtection) library - development files" - pkg_install() { - vmove "usr/lib/libssp*.a" - vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp - } -} - -libssp_package() { - short_desc+=" - SSP (StackSmashingProtection) library" - pkg_install() { - vmove "usr/lib/libssp.so*" - vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION - } -} - libstdc++-devel_package() { depends="libstdc++>=${_minorver}" short_desc+=" - Standard C++ Library - development files" diff --git a/srcpkgs/libssp b/srcpkgs/libssp deleted file mode 120000 index b08d5af5795..00000000000 --- a/srcpkgs/libssp +++ /dev/null @@ -1 +0,0 @@ -gcc \ No newline at end of file diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel deleted file mode 120000 index b08d5af5795..00000000000 --- a/srcpkgs/libssp-devel +++ /dev/null @@ -1 +0,0 @@ -gcc \ No newline at end of file