From 90d5c8b73e8d538e121275b12e714332ca785cff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Oct 2013 17:20:24 +0200
Subject: automatically create development subpackages, without user
 interaction, depend on gcc for the target, simplifies a lot of library
 packages

---
 package/cxxtools/Makefile | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'package/cxxtools')

diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 9470d8fb2..e72624b2e 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cxxtools
 PKG_VERSION:=		2.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2026a2bb23b966f13893167b4dbc5d70
 PKG_DESCR:=		a collection of general-purpose C++ classes (libraries)
 PKG_SECTION:=		libs
@@ -15,17 +15,13 @@ PKG_URL:=		http://www.tntnet.org/
 PKG_SITES:=		http://www.tntnet.org/download/
 PKG_NEED_CXX:=		1
 PKG_CXX:=		CXXTOOLS
+PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!arm !avr32
 
-PKG_SUBPKGS:=		CXXTOOLS CXXTOOLS_DEV
-PKGSC_CXXTOOLS_DEV:=	devel
-PKGSD_CXXTOOLS_DEV:=	a collection of general-purpose C++ classes (headers)
-
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CXXTOOLS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
@@ -45,11 +41,4 @@ cxxtools-install:
 	${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib
 
-cxxtools-dev-install:
-	${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* \
-		${IDIR_CXXTOOLS_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_CXXTOOLS_DEV}/usr/bin
-	${CP} ${WRKINST}/usr/bin/cxxtools-config ${IDIR_CXXTOOLS_DEV}/usr/bin
-
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From ff99570612d9d23292d3c7d91b31de6fba35a580 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Oct 2013 10:58:47 +0200
Subject: fix m68k allmodconfig build

---
 package/cxxtools/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/cxxtools')

diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index e72624b2e..26a18a99b 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -17,7 +17,7 @@ PKG_NEED_CXX:=		1
 PKG_CXX:=		CXXTOOLS
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!arm !avr32
+PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
 
 include ${TOPDIR}/mk/package.mk
 
-- 
cgit v1.2.3


From fbe47cba997e4f2f2dbaa6af0583dbec2e5d130c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 2 Nov 2013 12:03:09 +0100
Subject: remove dependencies to libiconv,pkg-config and file. use pkgconf and
 libiconv-tiny instead. fixes glib compile on systems without libiconv/ native
 iconv implementation

---
 package/cxxtools/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'package/cxxtools')

diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 26a18a99b..03a6bc4d3 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -9,8 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		2026a2bb23b966f13893167b4dbc5d70
 PKG_DESCR:=		a collection of general-purpose C++ classes (libraries)
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libiconv
-PKG_BUILDDEP:=		libiconv
+PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://www.tntnet.org/
 PKG_SITES:=		http://www.tntnet.org/download/
 PKG_NEED_CXX:=		1
-- 
cgit v1.2.3