From 781f64f1ef86073d854c697365d92bb99080241b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 5 Jun 2014 13:05:10 +0200
Subject: rework ssp support, use static version of libssp

---
 package/libssp/Makefile | 35 -----------------------------------
 package/pam/Makefile    |  3 ---
 2 files changed, 38 deletions(-)
 delete mode 100644 package/libssp/Makefile

(limited to 'package')

diff --git a/package/libssp/Makefile b/package/libssp/Makefile
deleted file mode 100644
index 09c363cb8..000000000
--- a/package/libssp/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-include ${TOPDIR}/toolchain/glibc/Makefile.inc
-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
-PKG_SECTION:=		libs/misc
-PKG_OPTS:=		noremove
-
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBSSP,libssp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-libssp-install:
-	${INSTALL_DIR} ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
-	${CP} ${STAGING_TARGET_DIR}/lib/libssp.so* ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pam/Makefile b/package/pam/Makefile
index 10aa6b8da..5894d7fd6 100644
--- a/package/pam/Makefile
+++ b/package/pam/Makefile
@@ -23,9 +23,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
-ifeq ($(ADK_TARGET_USE_SSP),y)
-TARGET_LDFLAGS+=	-lssp
-endif
 CONFIGURE_ARGS+=	--disable-nis \
 			--disable-regenerate-docu \
 			--enable-db=no
-- 
cgit v1.2.3