summaryrefslogtreecommitdiff
path: root/package/tntnet
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-30 20:39:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-30 20:39:07 +0200
commitba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (patch)
tree10c726d162bc0ded85eb7aeacf8f246bd39ad63a /package/tntnet
parentbbd610f15a71b27c955175cb98392b114717fd47 (diff)
optimize ipkg package management
- generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig
Diffstat (limited to 'package/tntnet')
-rw-r--r--package/tntnet/Makefile27
-rw-r--r--package/tntnet/files/tntnet.conffiles (renamed from package/tntnet/ipkg/tntnet.conffiles)0
-rw-r--r--package/tntnet/files/tntnet.postinst (renamed from package/tntnet/ipkg/tntnet.postinst)0
-rw-r--r--package/tntnet/ipkg/tntnet.control4
4 files changed, 20 insertions, 11 deletions
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 58f987b85..59c45ed5c 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -9,19 +9,35 @@ PKG_NAME:= tntnet
PKG_VERSION:= 1.6.4
PKG_RELEASE:= 1
PKG_MD5SUM:= e2c3c5075a890711a7569730493c0996
-MASTER_SITES:= http://www.tntnet.org/download/
+PKG_DESCR:= small C++ application server
+PKG_SECTION:= net
+PKG_DEPENDS:= cxxtools zlib libpthread libiconv
+PKG_URL:= http://www.tntnet.org
+PKG_SITES:= http://www.tntnet.org/download/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+PKG_DEPENDS+= uclibc++
+else
+PKG_DEPENDS+= libstdcxx
+endif
+
+ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y)
+PKG_DEPENDS+= libopenssl
+endif
+
+ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y)
+PKG_DEPENDS+= libgnutls
+endif
+
+$(eval $(call PKG_template,TNTNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
TLDFLAGS+= -nodefaultlibs -luClibc++ -liconv -lpthread -lcxxtools -lm
-DEPENDS= libgcc, uclibc++, cxxtools, zlib, libpthread, libiconv
else
TLDFLAGS+= -liconv -lpthread -lcxxtools -lm -ldl
-DEPENDS= libgcc, libstdcxx, cxxtools, zlib, libpthread, libiconv
endif
CONFIGURE_STYLE:= gnu
@@ -31,10 +47,8 @@ CONFIGURE_ARGS+= --without-epoll \
--without-sendfile
ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y)
CONFIGURE_ARGS+= --with-ssl=openssl
-SSL_DEPS= ", libopenssl"
else ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y)
CONFIGURE_ARGS+= --with-ssl=gnutls
-SSL_DEPS= ", libgnutls"
else
CONFIGURE_ARGS+= --without-ssl
endif
@@ -62,6 +76,5 @@ post-install:
${CP} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin
${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* ${IDIR_TNTNET}/usr/lib/tntnet
${CP} ${WRKINST}/usr/lib/libtntnet.so.* ${IDIR_TNTNET}/usr/lib
- echo Depends: ${DEPENDS}${SSL_DEPS} >>${IDIR_TNTNET}/CONTROL/control
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tntnet/ipkg/tntnet.conffiles b/package/tntnet/files/tntnet.conffiles
index def08bf81..def08bf81 100644
--- a/package/tntnet/ipkg/tntnet.conffiles
+++ b/package/tntnet/files/tntnet.conffiles
diff --git a/package/tntnet/ipkg/tntnet.postinst b/package/tntnet/files/tntnet.postinst
index 9d462f8d3..9d462f8d3 100644
--- a/package/tntnet/ipkg/tntnet.postinst
+++ b/package/tntnet/files/tntnet.postinst
diff --git a/package/tntnet/ipkg/tntnet.control b/package/tntnet/ipkg/tntnet.control
deleted file mode 100644
index 788b3b450..000000000
--- a/package/tntnet/ipkg/tntnet.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: tntnet
-Priority: optional
-Section: net
-Description: a modular, multithreaded webapplicationserver