diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-17 20:25:42 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-17 20:26:15 +0200 |
| commit | 84cf411832e802d77807df716d4afb6a710c3650 (patch) | |
| tree | 078e2bcf2bab9099f359db77971c43ce897be72c /package | |
| parent | 15a3acd9401a80e7182a0ba188efebf04ce43f35 (diff) | |
update to latest upstream, disable broken gnutls
Diffstat (limited to 'package')
| -rw-r--r-- | package/cxxtools/Makefile | 10 | ||||
| -rw-r--r-- | package/tntnet/Makefile | 11 |
2 files changed, 12 insertions, 9 deletions
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 5bfc15998..a61c71d9c 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools -PKG_VERSION:= 2.1.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 2026a2bb23b966f13893167b4dbc5d70 -PKG_DESCR:= a collection of general-purpose C++ classes (libraries) +PKG_VERSION:= 2.2.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= aab00068ae5237435b37ac86f2ac7576 +PKG_DESCR:= collection of general-purpose C++ classes PKG_SECTION:= libs PKG_BUILDDEP:= libiconv-tiny PKG_URL:= http://www.tntnet.org/ @@ -17,12 +17,12 @@ PKG_CXX:= CXXTOOLS PKG_OPTS:= dev PKG_ARCH_DEPENDS:= !arm !m68k +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include ${TOPDIR}/mk/package.mk $(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) TARGET_CXXFLAGS+= -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index e8e674fcc..db8684ef5 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tntnet -PKG_VERSION:= 2.1 +PKG_VERSION:= 2.2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= a9c85aa6d624f7f88c48374f28730242 +PKG_MD5SUM:= febe799675c1b8b2f7259bad30cf6f23 PKG_DESCR:= small C++ application server PKG_SECTION:= www PKG_DEPENDS:= cxxtools zlib libpthread @@ -16,8 +16,10 @@ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= !arm !m68k +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_TNTNET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL +PKG_CHOICES_TNTNET:= WITH_OPENSSL WITHOUT_SSL +#PKG_CHOICES_TNTNET:= WITH_GNUTLS WITH_OPENSSL WITHOUT_SSL PKGCD_WITHOUT_SSL:= use no SSL PKGCD_WITH_OPENSSL:= use OpenSSL for crypto PKGCS_WITH_OPENSSL:= libopenssl @@ -43,6 +45,8 @@ endif CONFIGURE_ARGS+= --without-epoll \ --without-sdk \ --without-cgi \ + --disable-unittest \ + --disable-locale \ --without-sendfile CONFIGURE_ENV+= CXXFLAGS='${TARGET_CXXFLAGS}' \ ac_cv_path_cxxtools_config=${STAGING_TARGET_DIR}/usr/bin @@ -62,7 +66,6 @@ post-configure: ${WRKBUILD}/libtool endif - tntnet-install: ${INSTALL_DIR} ${IDIR_TNTNET}/www ${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet |