X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=a5e9fbe9153b9458ae3da4998a9bc3bc6fb635b7;hb=5c809ecfe7f227c77ba6c4ad3a87cf6263bee477;hp=a94f2a4c063a29d3f4b7fd16088bbb4cfb29c8de;hpb=3e2f57835342074a90843077c1c63c88a42e6217;p=librecmc%2Flibrecmc.git

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index a94f2a4c06..a5e9fbe915 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -1,11 +1,11 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
-PKG_DEFAULT_DEPENDS = +libc +USE_GLIBC:librt +USE_GLIBC:libpthread
+PKG_DEFAULT_DEPENDS = +libc +(SSP_SUPPORT&&!USE_MUSL):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)))
@@ -67,7 +67,11 @@ ifneq ($(strip $(PKG_UNPACK)),)
 endif
 
 EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
-DISABLE_NLS:=--disable-nls
+ifeq ($(CONFIG_BUILD_NLS),y)
+    DISABLE_NLS:=
+else
+    DISABLE_NLS:=--disable-nls
+endif
 
 CONFIGURE_PREFIX:=/usr
 CONFIGURE_ARGS = \