diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/cxxtools | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cxxtools')
| -rw-r--r-- | package/cxxtools/Makefile | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 9470d8fb2..03a6bc4d3 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -5,27 +5,22 @@ 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 -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 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) +PKG_ARCH_DEPENDS:= !arm !avr32 !m68k 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 +40,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 |