diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 17:53:55 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 17:53:55 +0200 |
| commit | 1cd31f169fab4ab0ce45617c161da3fec9f7359d (patch) | |
| tree | e705bef0fbb742cafc1ca64b6c786db1b82622ab /package/libtorrent | |
| parent | 5e82ed3e9ada7f5c9e66db5568032a49f66a6e93 (diff) | |
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
Diffstat (limited to 'package/libtorrent')
| -rw-r--r-- | package/libtorrent/Config.in | 20 | ||||
| -rw-r--r-- | package/libtorrent/Makefile | 21 |
2 files changed, 39 insertions, 2 deletions
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in index 6b65665a1..be20ecbea 100644 --- a/package/libtorrent/Config.in +++ b/package/libtorrent/Config.in @@ -3,8 +3,26 @@ config ADK_PACKAGE_LIBTORRENT tristate default n depends on ADK_CXX - select ADK_PACKAGE_LIBSTDCXX select ADK_PACKAGE_LIBOPENSSL select ADK_PACKAGE_LIBSIGCXX help http://libtorrent.rakshasa.no/ + +choice +prompt "C++ library to use" +depends on ADK_PACKAGE_LIBTORRENT +default ADK_COMPILE_LIBTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC +default ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC + +config ADK_COMPILE_LIBTORRENT_WITH_STDCXX + bool "Standard C++ library" + select ADK_PACKAGE_LIBSTDCXX + help + +config ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX + bool "Embedded uClibc++ library" + select ADK_PACKAGE_UCLIBCXX + depends ADK_BROKEN + help + +endchoice 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/ |