From 1cd31f169fab4ab0ce45617c161da3fec9f7359d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 May 2009 17:53:55 +0200 Subject: fix regressions from ipkg rework - remove old glib1 lib - rename glib2 -> glib - rename libgdbm -> gdbm - remove obsoleted wireless-tools, use iw - remove upstream unmaintained slurm make allmodconfig runs through on Debian/lenny amd64 for alix1c target --- package/libtorrent/Makefile | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'package/libtorrent/Makefile') diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index ae02d589b..eb3d7b4ac 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -11,19 +11,38 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0831ca06f8906c7898fd67931ab239c7 PKG_DESCR:= A bittorrent library PKG_SECTION:= libs -PKG_DEPENDS:= libopenssl libstdcxx libsigc++ +PKG_DEPENDS:= libopenssl libsigc++ PKG_URL:= http://libtorrent.rakshasa.no PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ include ${TOPDIR}/mk/package.mk +ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) +PKG_DEPENDS+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +endif + $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) +CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \ + -I${STAGING_DIR}/usr/include/uClibc++" \ + LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" +endif + CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-aligned BUILD_STYLE= auto INSTALL_STYLE= auto confprog +ifeq (${ADK_COMPILE_LIBTORRENT_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_LIBTORRENT}/usr/lib ${CP} ${WRKINST}/usr/lib/libtorrent.so.* ${IDIR_LIBTORRENT}/usr/lib/ -- cgit v1.2.3