From 05d0076d97ed69a531df1aa5cde3a1e6ed17f922 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Sep 2010 19:04:46 +0200 Subject: replace mksh scripts with faster C programs depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes, so that a package is rebuild. Generation of meta-data is a lot faster now. Fix or add new PKG variables to fulfill the needs of the new programs. Documentation will follow as soon as it is stable. --- package/tntnet/Makefile | 41 +++++------------------------------------ 1 file changed, 5 insertions(+), 36 deletions(-) (limited to 'package/tntnet/Makefile') diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 9f9f37277..e6f1ddb90 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -10,54 +10,23 @@ PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996 PKG_DESCR:= small C++ application server PKG_SECTION:= www PKG_DEPENDS:= cxxtools zlib libiconv libpthread -PKG_BUILDDEP+= cxxtools zlib libiconv -ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},) -PKG_BUILDDEP+= openssl -else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},) -PKG_BUILDDEP+= gnutls -endif -PKG_URL:= http://www.tntnet.org +PKG_BUILDDEP:= cxxtools zlib libiconv +PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ -#PKG_CXX:= TNTNET include ${TOPDIR}/mk/package.mk -ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},) -PKG_DEPENDS+= libopenssl -else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},) -PKG_DEPENDS+= libgnutls -endif - $(eval $(call PKG_template,TNTNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E -TLDFLAGS+= -nodefaultlibs -luClibc++ -liconv -lpthread -lcxxtools -lm -ldl -else -TLDFLAGS+= -liconv -lpthread -lcxxtools -lm -ldl -endif - CONFIGURE_ARGS+= --without-epoll \ --without-sdk \ --without-cgi \ - --without-sendfile -ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y) -CONFIGURE_ARGS+= --with-ssl=openssl -else ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y) -CONFIGURE_ARGS+= --with-ssl=gnutls -else -CONFIGURE_ARGS+= --without-ssl -endif + --without-sendfile \ + --without-ssl + CONFIGURE_ENV+= CXXFLAGS='${TCXXFLAGS}' \ ac_cv_path_cxxtools_config=${STAGING_DIR}/usr/bin -#ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -#post-configure: -# ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ -# ${WRKBUILD}/libtool -#endif - post-install: ${INSTALL_DIR} ${IDIR_TNTNET}/www ${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet -- cgit v1.2.3