Changeset 8432a86 in freewrt

Timestamp:

Mar 7, 2007, 8:52:17 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Children:

6a4b1e56

Parents:

1c8c850

Message:

fix tntnet compile

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2135 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/pkg-depend.mk (modified) (1 diff)
• package/Config.in (modified) (1 diff)
• package/tntnet/Config.in (modified) (1 diff)
• package/tntnet/Makefile (modified) (1 diff)
• package/tntnet/ipkg/tntnet.control (modified) (1 diff)

mk/pkg-depend.mk

@@ -127 +127 @@
 tcpdump-compile: libpcap-compile
 tinc-compile: zlib-compile openssl-compile liblzo-compile
-tntnet-compile: uclibc++-compile cxxtools-compile
+tntnet-compile: uclibc++-compile cxxtools-compile openssl-compile zlib-compile
 tor-compile: libevent-compile openssl-compile zlib-compile
 trafshow: ncurses-compile libpcap-compile

package/Config.in

@@ -200 +200 @@
 source "package/tinc/Config.in"
 source "package/tinyproxy/Config.in"
-#source "package/tntnet/Config.in"
+source "package/tntnet/Config.in"
 source "package/tor/Config.in"
 source "package/trafshow/Config.in"

package/tntnet/Config.in

@@ -4 +4 @@
         default n
         select FWRT_PACKAGE_UCLIBCXX
+        select FWRT_PACKAGE_CXXTOOLS
+        select FWRT_PACKAGE_LIBOPENSSL
         select FWRT_PACKAGE_LIBGCC
-        select FWRT_PACKAGE_CXXTOOLS
+        select FWRT_PACKAGE_ZLIB
         help
           Tntnet is a modular, multithreaded webapplicationserver 

package/tntnet/Makefile

@@ -18 +18 @@
 $(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
+TCXXFLAGS+=             -fno-builtin -fno-rtti -nostdinc++
+TLDFLAGS+=              -luClibc++ -lc -lm -liconv -lcxxtools -nodefaultlibs
 CONFIGURE_STYLE:=       gnu
-CONFIGURE_ARGS+=        --with-ssl=no
-CONFIGURE_ENV+=         CXXFLAGS="${TCFLAGS} -fno-builtin -fno-rtti -nostdinc++" \
-                        LDFLAGS="-nodefaultlibs ${TLDFLAGS}" \
-                        LIBS="-luClibc++ -lc -lm -lz -lcxxtools" \
-                        ac_cv_prog_CXX="${TARGET_CXX}"
+CONFIGURE_ARGS+=        --with-ssl=openssl \
+                        --without-sdk
+CONFIGURE_ENV+=         LIBS="-luClibc++ -lc -lm -lz -lcxxtools" \
+                        LDFLAGS="${TLDFLAGS}" \
+                        CXXFLAGS="${TCXXFLAGS} -nodefaultlibs -L${STAGING_DIR}/usr/lib"
 BUILD_STYLE:=           auto
-MAKE_FLAGS+=            CCOPT="${TARGET_CFLAGS} -fno-builtin -nostdinc++" \
-                        LDFLAGS="-nodefaultlibs ${TLDFLAGS}"
-INSTALL_STYLE:=         manual
+INSTALL_STYLE:=         auto
+XAKE_FLAGS+=            PATH=$(TARGET_PATH)
 
-do-install:
+# add workaround because libtool tries to link libstdc++
+post-configure:
+        ${SED} 's#postdeps="-lstdc.*#postdeps="-lm -lc"#' \
+                ${WRKBUILD}/libtool
+        ${WRKBUILD}/tntnet-config --config=myapp > ${WRKBUILD}/tntnet.conf
+
+post-install:
+        ${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet
         ${INSTALL_DIR} ${IDIR_TNTNET}/usr/bin
+        ${INSTALL_DIR} ${IDIR_TNTNET}/usr/lib
+        ${INSTALL_DIR} ${IDIR_TNTNET}/usr/lib/tntnet
+        ${INSTALL_BIN} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin
+        ${CP} ${WRKINST}/usr/lib/tntnet/* ${IDIR_TNTNET}/usr/lib/tntnet
+        ${CP} ${WRKINST}/usr/lib/libtntnet_cgi.so.* ${IDIR_TNTNET}/usr/lib
+        ${CP} ${WRKINST}/usr/lib/libtntnet.so.* ${IDIR_TNTNET}/usr/lib
+        ${INSTALL_DATA} ${WRKBUILD}/tntnet.conf ${IDIR_TNTNET}/etc/tntnet
+        ${INSTALL_DATA} ${WRKBUILD}/etc/tntnet/mime.conf ${IDIR_TNTNET}/etc/tntnet
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/tntnet/ipkg/tntnet.control

@@ -2 +2 @@
 Priority: optional
 Section: net
-Depends: libgcc, uclibc++
+Depends: libgcc, uclibc++, cxxtools, zlib, libpthread, gnutls, libiconv
 Description: a modular, multithreaded webapplicationserver