diff options
Diffstat (limited to 'package/tntnet')
| -rw-r--r-- | package/tntnet/Config.in | 18 | ||||
| -rw-r--r-- | package/tntnet/Makefile | 10 |
2 files changed, 23 insertions, 5 deletions
diff --git a/package/tntnet/Config.in b/package/tntnet/Config.in index 0d4391674..02fecc301 100644 --- a/package/tntnet/Config.in +++ b/package/tntnet/Config.in @@ -35,3 +35,21 @@ config ADK_COMPILE_TNTNET_WITH_GNUTLS help endchoice + +choice +prompt "C++ library to use" +depends on ADK_PACKAGE_TNTNET +default ADK_COMPILE_TNTNET_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +default ADK_COMPILE_TNTNET_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC + +config ADK_COMPILE_TNTNET_WITH_STDCXX + bool "Standard C++ library" + select ADK_PACKAGE_LIBSTDCXX + help + +config ADK_COMPILE_TNTNET_WITH_UCLIBCXX + bool "Embedded uClibc++ library" + select ADK_PACKAGE_UCLIBCXX + help + +endchoice diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 1358e58e6..c251da7a9 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -15,7 +15,7 @@ PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) PKG_DEPENDS+= uclibc++ else PKG_DEPENDS+= libstdcxx @@ -31,9 +31,9 @@ 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 +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 @@ -55,7 +55,7 @@ CONFIGURE_ENV+= CXXFLAGS='${TCXXFLAGS}' \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ post-configure: ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \ |