fix symbol renaming bugs

10 files changed, 11 insertions, 20 deletions

diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 8cec76b0e..c8299f775 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+=	--enable-glib \
 			--with-avahi-user=avahi \
 			--with-avahi-group=avahi
 
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 CONFIGURE_ARGS+=	--enable-stack-protector
 else
 CONFIGURE_ARGS+=	--disable-stack-protector
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index ec7e15aab..77d87e97e 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -24,7 +24,7 @@ $(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEAS
 
 ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
 LIBRARIES:=		-nodefaultlibs -luClibc++ -lm -lc -lgcc
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 LIBRARIES+=		-lssp
 endif
 endif
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index a3251f5e1..e488912d5 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -28,7 +28,7 @@ $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 
 ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y)
 LIBRARIES:=		-nodefaultlibs -luClibc++ -lm -lc -lgcc
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 LIBRARIES+=		-lssp -lssp_nonshared
 endif
 endif
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index fde09978b..b727068b3 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -30,7 +30,7 @@ ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
 LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc
 endif
 
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 LIBRARIES+=-lssp -fstack-protector
 endif
 
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index 02d755b4b..c1e3dabd7 100644
--- a/package/libssp/Makefile
+++ b/package/libssp/Makefile
@@ -9,6 +9,9 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uclibc/Makefile.inc
 endif
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
+include ${TOPDIR}/toolchain/musl/Makefile.inc
+endif
 
 PKG_NAME:=		libssp
 PKG_DESCR:=		stack smashing protection library
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 3e8a80a38..ef7921c6e 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -24,11 +24,10 @@ CONFIG_STYLE:=		manual
 
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
 LIBRARIES:=-nodefaultlibs -luClibc++
-endif
-
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
+endif
 
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
 TARGET_CXXFLAGS+=	-fno-builtin -nostdinc++ \
diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile
index a83c0a6e0..c95c43c1a 100644
--- a/package/net-tools/Makefile
+++ b/package/net-tools/Makefile
@@ -23,9 +23,6 @@ $(eval $(call PKG_template,ARP,arp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},
 
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
-TARGET_LDFLAGS+=	-lssp
-endif
 
 do-configure:
 	$(CP) ./files/config.* $(WRKBUILD)/
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 7c3efda55..645fd3e6c 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
-LIBRARIES+=-lssp -lssp_nonshared
-endif
-
 TARGET_CPPFLAGS+=	-DNOLUA
 TARGET_LDFLAGS+=	-lpthread
 CONFIGURE_ENV+=		ac_cv_dnet_bsd_bpf=no
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 94f9812f0..74eb3cc16 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
 TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal
 endif
 
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 CONFIGURE_ARGS+=	--with-stackprotect
 else
 CONFIGURE_ARGS+=	--without-stackprotect
@@ -84,10 +84,6 @@ CONFIGURE_ARGS+=	--disable-strip \
 			--with-privsep-path=/var/run/sshd \
 			--with-ssl-dir="${STAGING_TARGET_DIR}/usr"
 
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+=		-static
-TARGET_LDFLAGS+=	-static
-endif
 
 openssh-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH}/etc/ssh
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index 33f346a75..58e005934 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--without-pam \
 			--without-sendmail \
 			--with-env-editor
 
-ifeq ($(ADK_TOOLCHAIN_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 CONFIGURE_ARGS+=	--enable-hardening
 else
 CONFIGURE_ARGS+=	--disable-hardening