aboutsummaryrefslogtreecommitdiffstats
path: root/include/package-defaults.mk
diff options
context:
space:
mode:
authorJulien Dusser <julien.dusser@free.fr>2018-01-07 18:47:21 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-01-27 19:02:48 +0100
commit241e6dd3e92c4f215b8ac75379a4b5aeaeb92171 (patch)
treedf5884c1112280f9d9c04f292e854e55e7b29bb1 /include/package-defaults.mk
parent55779569eb817361222d653accd929a752b8327d (diff)
downloadupstream-241e6dd3e92c4f215b8ac75379a4b5aeaeb92171.tar.gz
upstream-241e6dd3e92c4f215b8ac75379a4b5aeaeb92171.tar.bz2
upstream-241e6dd3e92c4f215b8ac75379a4b5aeaeb92171.zip
build: cleanup SSP_SUPPORT configure option
Configure variable SSP_SUPPORT is ambiguous for packages (tor, openssh, avahi, freeswitch). It means 'toolchain supporting SSP', but for toolchain and depends it means 'build gcc with libssp'. Musl no longer uses libssp (1877bc9d8f), it has internal support, so SSP_SUPPORT was disabled leading some package to not use SSP. No information why Glibc and uClibc use libssp, but they may also provide their own SSP support. uClibc used it own with commit 933b588e25 but it was reverted in f3cacb9e84 without details. Create an new configure GCC_LIBSSP and automatically enable SSP_SUPPORT if either USE_MUSL or GCC_LIBSSP. Signed-off-by: Julien Dusser <julien.dusser@free.fr>
Diffstat (limited to 'include/package-defaults.mk')
-rw-r--r--include/package-defaults.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 0bca076e72..6bbfdcc3cc 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -5,7 +5,7 @@
# See /LICENSE for more information.
#
-PKG_DEFAULT_DEPENDS = +libc +SSP_SUPPORT:libssp +USE_GLIBC:librt +USE_GLIBC:libpthread
+PKG_DEFAULT_DEPENDS = +libc +GCC_LIBSSP:libssp +USE_GLIBC:librt +USE_GLIBC:libpthread
ifneq ($(PKG_NAME),toolchain)
PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2)))