diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
| commit | 537a2c4eaa446e52c6ba07007eb9ae75998b5580 (patch) | |
| tree | b48cc775042b4274dce470527826007de7a7fa84 /package/libtorrent | |
| parent | 18b3987c6d890f02c80b976b6cf6835053ef1fe9 (diff) | |
| parent | ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 (diff) | |
Merge commit 'origin/confgen'
finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos
Conflicts:
.gitignore
Makefile
mk/build.mk
package/eglibc/Config.in
package/glibc/Config.in
package/uclibc++/Config.in
package/uclibc/Config.in
rules.mk
Diffstat (limited to 'package/libtorrent')
| -rw-r--r-- | package/libtorrent/Config.in | 27 | ||||
| -rw-r--r-- | package/libtorrent/Makefile | 8 |
2 files changed, 2 insertions, 33 deletions
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in deleted file mode 100644 index ebe757f74..000000000 --- a/package/libtorrent/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config ADK_PACKAGE_LIBTORRENT - prompt "libtorrent........................ bittorrent library" - tristate - default n - 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 || ADK_TARGET_LIB_EGLIBC -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 on ADK_BROKEN - help - -endchoice diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 331086440..4d55aa87e 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -6,21 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtorrent PKG_VERSION:= 0.12.5 PKG_RELEASE:= 1 +PKG_BUILDDEP+= openssl libsigc++ PKG_MD5SUM:= fe8155d364b220713074423100d4bf29 PKG_DESCR:= A bittorrent library PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsigc++ PKG_URL:= http://libtorrent.rakshasa.no PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ +PKG_CXX:= LIBTORRENT 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) |