From bae2cf7b9802f9ca6787c1e734e547f6feafe3da Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
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/id3lib/Makefile | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'package/id3lib')

diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 715792fc6..bac03865d 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -11,9 +11,9 @@ PKG_DESCR:=		id3 tagging library
 PKG_SECTION:=		libs/audio
 PKG_DEPENDS:=		zlib
 PKG_BUILDDEP:=		zlib
+PKG_NEEDS:=		c++
 PKG_URL:=		http://id3lib.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=id3lib/}
-PKG_CXX:=		ID3LIB
 PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -23,22 +23,11 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS+=		-fPIC
+TARGET_LDFLAGS+=	-shared
 CONFIGURE_ARGS+=	--enable-cxx-warnings=no
 
-ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
-LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc
-endif
-
 ifeq ($(ADK_TARGET_USE_SSP),y)
-LIBRARIES+=-lssp -fstack-protector
-endif
-
-ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
-TARGET_CXXFLAGS+=	-fno-builtin -fno-rtti -nostdinc++ \
-			-I${STAGING_TARGET_DIR}/usr/include/uClibc++
-CONFIGURE_ENV+=		LIBS="${LIBRARIES}"
-else
-TARGET_LDFLAGS+=	-shared
+LIBRARIES+=		-lssp -fstack-protector
 endif
 
 id3lib-install:
-- 
cgit v1.2.3