summaryrefslogtreecommitdiff
path: root/package/cxxtools
diff options
context:
space:
mode:
Diffstat (limited to 'package/cxxtools')
-rw-r--r--package/cxxtools/Makefile17
-rw-r--r--package/cxxtools/ipkg/cxxtools.control4
2 files changed, 12 insertions, 9 deletions
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 8458b7729..392581ce8 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -9,19 +9,27 @@ PKG_NAME:= cxxtools
PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af
-MASTER_SITES:= http://www.tntnet.org/download/
+PKG_DESCR:= a collection of general-purpose C++ classes
+PKG_SECTION:= net
+PKG_DEPENDS:= libiconv
+PKG_URL:= http://www.tntnet.org
+PKG_SITES:= http://www.tntnet.org/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+PKG_DEPENDS+= uclibc++
+else
+PKG_DEPENDS+= libstdcxx
+endif
+
+$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++
TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs
-DEPENDS= "libgcc, uclibc++, libiconv"
else
TLDFLAGS+= -liconv -shared
-DEPENDS= "libgcc, libiconv, libstdcxx"
endif
CONFIGURE_STYLE:= gnu
@@ -39,6 +47,5 @@ endif
post-install:
${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
${CP} ${WRKINST}/usr/lib/libcxxtools.so.* ${IDIR_CXXTOOLS}/usr/lib/
- echo Depends: ${DEPENDS} >>${IDIR_CXXTOOLS}/CONTROL/control
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cxxtools/ipkg/cxxtools.control b/package/cxxtools/ipkg/cxxtools.control
deleted file mode 100644
index 130236235..000000000
--- a/package/cxxtools/ipkg/cxxtools.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: cxxtools
-Priority: optional
-Section: net
-Description: cxxtools