diff options
| -rw-r--r-- | package/cxxtools/Makefile | 18 | ||||
| -rw-r--r-- | package/tntnet/Makefile | 18 |
2 files changed, 5 insertions, 31 deletions
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 3fcddf392..df140ecf8 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -5,15 +5,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools PKG_VERSION:= 2.2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= aab00068ae5237435b37ac86f2ac7576 PKG_DESCR:= collection of general-purpose C++ classes PKG_SECTION:= libs -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 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -22,18 +20,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -TARGET_CXXFLAGS+= -fno-builtin -nostdinc++ \ - -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E -TARGET_LDFLAGS+= -luClibc++ -liconv -lm -lc -nodefaultlibs -shared -else -TARGET_LDFLAGS+= -liconv -shared -endif - -TARGET_CFLAGS+= -fPIC -TARGET_CXXFLAGS+= -fPIC -CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \ - --disable-demos --disable-unittest +CONFIGURE_ARGS+= --disable-demos \ + --disable-unittest cxxtools-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 8e25b1c29..524f4d31f 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tntnet PKG_VERSION:= 2.2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= febe799675c1b8b2f7259bad30cf6f23 PKG_DESCR:= small C++ application server PKG_SECTION:= www PKG_DEPENDS:= cxxtools zlib libpthread -PKG_BUILDDEP:= cxxtools zlib libiconv-tiny +PKG_BUILDDEP:= cxxtools zlib PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 @@ -49,20 +49,6 @@ CONFIGURE_ARGS+= --without-epoll \ CONFIGURE_ENV+= CXXFLAGS='${TARGET_CXXFLAGS}' \ ac_cv_path_cxxtools_config=${STAGING_TARGET_DIR}/usr/bin -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -TARGET_CXXFLAGS+= -fno-builtin -nostdinc++ \ - -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E -TARGET_LDFLAGS+= -luClibc++ -lm -lc -ldl -nodefaultlibs -shared -else -TARGET_LDFLAGS+= -ldl -endif - -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ - ${WRKBUILD}/libtool -endif tntnet-install: ${INSTALL_DIR} ${IDIR_TNTNET}/www |