summaryrefslogtreecommitdiff
path: root/package/cxxtools/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:15:44 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:15:44 +0100
commit483e9fde0b3923169c3c70720ca94b032dd30ae8 (patch)
treebd4ea28db271093276fe295b2da2e000a28aa857 /package/cxxtools/Makefile
parent10997d993a55465525b026b9404f5809687e9e3c (diff)
parent25448b89bc693d56b074cd7b2a9c60ddc12f7404 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cxxtools/Makefile')
-rw-r--r--package/cxxtools/Makefile18
1 files changed, 3 insertions, 15 deletions
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 326bed156..7a3e3f142 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -13,15 +13,14 @@ PKG_DEPENDS:= libiconv
PKG_BUILDDEP+= libiconv
PKG_URL:= http://www.tntnet.org
PKG_SITES:= http://www.tntnet.org/download/
-#PKG_CXX:= CXXTOOLS
-
include ${TOPDIR}/mk/package.mk
$(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++ -Wl,-E
+TCXXFLAGS+= -fno-builtin -nostdinc++ \
+ -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E
TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared
else
TLDFLAGS+= -liconv -shared
@@ -29,21 +28,10 @@ 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