diff options
Diffstat (limited to 'package/cxxtools')
| -rw-r--r-- | package/cxxtools/Config.in | 26 | ||||
| -rw-r--r-- | package/cxxtools/Makefile | 25 | ||||
| -rw-r--r-- | package/cxxtools/patches/patch-Makefile_in | 11 |
3 files changed, 16 insertions, 46 deletions
diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in deleted file mode 100644 index bdc0168a7..000000000 --- a/package/cxxtools/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config ADK_PACKAGE_CXXTOOLS - prompt "cxxtools.......................... cxxtools" - tristate - default n - depends on ADK_CXX - select ADK_PACKAGE_LIBICONV - help - http://www.tntnet.org - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_CXXTOOLS -default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC -default ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_CXXTOOLS_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index f3a270aa8..7a3e3f142 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -10,43 +10,28 @@ PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net PKG_DEPENDS:= libiconv +PKG_BUILDDEP+= libiconv PKG_URL:= http://www.tntnet.org PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs +TCXXFLAGS+= -fno-builtin -nostdinc++ \ + -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E +TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared else TLDFLAGS+= -liconv -shared endif TCFLAGS+= -fPIC TCXXFLAGS+= -fPIC -CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_lib_nsl_setsockopt=no CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr' -BUILD_STYLE:= auto -INSTALL_STYLE:= auto confprog - -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif post-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcxxtools.so.* ${IDIR_CXXTOOLS}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cxxtools/patches/patch-Makefile_in b/package/cxxtools/patches/patch-Makefile_in new file mode 100644 index 000000000..d0936ae5d --- /dev/null +++ b/package/cxxtools/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- cxxtools-1.4.8.orig/Makefile.in 2008-05-26 19:51:34.000000000 +0200 ++++ cxxtools-1.4.8/Makefile.in 2009-11-19 22:10:18.000000000 +0100 +@@ -200,7 +200,7 @@ subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = src include demo ++SUBDIRS = src include + bin_SCRIPTS = cxxtools-config + EXTRA_dist = \ + m4/acx_pthread.m4 \ |