From bae2cf7b9802f9ca6787c1e734e547f6feafe3da Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Nov 2015 10:57:34 +0100 Subject: remove bitrotted uClibc++ support Please use PKG_NEEDS for marking of packages needing C++ compiler. Remove the old bitrotted uClibc++ package and support for some packages. --- package/dansguardian/Makefile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'package/dansguardian/Makefile') diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 1d80f4097..4d27872ed 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -11,9 +11,9 @@ PKG_DESCR:= web content filter proxy PKG_SECTION:= net/proxy PKG_DEPENDS:= libpcre zlib PKG_BUILDDEP:= pcre zlib +PKG_NEEDS:= c++ PKG_URL:= http://dansguardian.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dansguardian/} -PKG_CXX:= DANSGUARDIAN DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -21,19 +21,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) -LIBRARIES:= -nodefaultlibs -luClibc++ -lm -lc -lgcc -ifeq ($(ADK_TARGET_USE_SSP),y) -LIBRARIES+= -lssp -endif -endif - -ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ - -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ - LIBS="$(LIBRARIES)" -endif - CONFIGURE_ARGS+= --enable-orig-ip \ --with-proxyuser=proxy \ --with-proxygroup=proxy -- cgit v1.2.3