diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/cbtt | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/cbtt')
| -rw-r--r-- | package/cbtt/Makefile | 22 | ||||
| -rw-r--r-- | package/cbtt/ipkg/cbtt-mysql.control | 5 | ||||
| -rw-r--r-- | package/cbtt/ipkg/cbtt.control | 5 |
3 files changed, 19 insertions, 13 deletions
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile index ec6ee34bd..db4a582a4 100644 --- a/package/cbtt/Makefile +++ b/package/cbtt/Makefile @@ -9,14 +9,30 @@ PKG_NAME:= cbtt PKG_VERSION:= 20060211 PKG_RELEASE:= 1 PKG_MD5SUM:= 19abea2817c49ccc9438e9671c402984 +PKG_DESCR:= Bittorrent tracker +PKG_SECTION:= net +PKG_DEPENDS:= zlib +PKG_URL:= http://bnbtusermods.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bnbtusermods/} + +PKG_DESCR_1:= Bittorrent tracker with mysql support +PKG_DEPENDS_1:= ${PKG_DEPENDS} libmysqlclient + DISTFILES:= ${PKG_NAME}80-${PKG_VERSION}-src.tar.gz -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=bnbtusermods/} WRKDIST= ${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE})) +ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y) +PKG_DEPENDS+= uclibc++ +PKG_DEPENDS_1+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +PKG_DEPENDS_1+= libstdcxx +endif + +$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) BUILD_STYLE= auto TLDFLAGS+= -shared -L. -L${STAGING_DIR}/usr/lib/mysql \ diff --git a/package/cbtt/ipkg/cbtt-mysql.control b/package/cbtt/ipkg/cbtt-mysql.control deleted file mode 100644 index ef8b52a32..000000000 --- a/package/cbtt/ipkg/cbtt-mysql.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cbtt-mysql -Priority: optional -Section: net -Depends: zlib, libmysqlclient, uclibc++ -Description: Bittorrent tracker with mysql support diff --git a/package/cbtt/ipkg/cbtt.control b/package/cbtt/ipkg/cbtt.control deleted file mode 100644 index bc8b844ad..000000000 --- a/package/cbtt/ipkg/cbtt.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cbtt -Priority: optional -Section: net -Depends: zlib, uclibc++ -Description: Bittorrent tracker |