diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/cxxtools | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/cxxtools')
| -rw-r--r-- | package/cxxtools/Makefile | 17 | ||||
| -rw-r--r-- | package/cxxtools/ipkg/cxxtools.control | 4 |
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 |