* Cleanup Makefile (still not perfect but a start)
 * Update 20060211 > 20060727
 * Refresh patch
 * cbtt needs uClibc++

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8510 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
olli 2007-08-27 21:45:30 +00:00
parent 22967a6995
commit c062050e8f
2 changed files with 12 additions and 21 deletions

View File

@ -8,28 +8,25 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cbtt PKG_NAME:=cbtt
PKG_VERSION:=20060211 PKG_VERSION:=20060727
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=19abea2817c49ccc9438e9671c402984
PKG_SOURCE_URL:=@SF/bnbtusermods
PKG_SOURCE:=$(PKG_NAME)80-$(PKG_VERSION)-src.tar.gz PKG_SOURCE:=$(PKG_NAME)80-$(PKG_VERSION)-src.tar.gz
PKG_CAT:=zcat PKG_SOURCE_URL:=@SF/bnbtusermods
PKG_MD5SUM:=d6edf0a11d7e68fa3d121e91308f22f5
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)80-$(PKG_VERSION)-src PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)80-$(PKG_VERSION)-src
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
PKG_BUILD_DEPENDS=zlib libmysqlclient
define Package/cbtt define Package/cbtt
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=zlib DEPENDS:=zlib
MENU:=1 MENU:=1
TITLE:=Bittorrent tracker TITLE:=Bittorrent tracker
DEPENDS:=+libpthread DEPENDS:=+libpthread +uclibcxx
DESCRIPTION:=a C BitTorrent Tracker DESCRIPTION:=a C BitTorrent Tracker
URL:=http://bnbtusermods.sourceforge.net URL:=http://bnbtusermods.sourceforge.net
endef endef
@ -37,7 +34,7 @@ endef
define Package/cbtt-mysql define Package/cbtt-mysql
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=cbtt +libmysqlclient +libpthread DEPENDS:=cbtt +libmysqlclient
TITLE:=Bittorrent tracker with mysql support TITLE:=Bittorrent tracker with mysql support
DESCRIPTION:=Bittorrent tracker with mysql support DESCRIPTION:=Bittorrent tracker with mysql support
URL:=http://bnbtusermods.sourceforge.net URL:=http://bnbtusermods.sourceforge.net
@ -48,8 +45,8 @@ define Build/Compile
mkdir -p $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
LFLAGS="-L$(STAGING_DIR)/usr/lib -L $(STAGING_DIR)/usr/lib/mysql -L. -lz -lmysqlclient -lpthread" \ LFLAGS="-L$(STAGING_DIR)/usr/lib -L $(STAGING_DIR)/usr/lib/mysql -L. -lz -lmysqlclient -lpthread -luClibc++ -lc -lm -lgcc" \
CFLAGS="-I$(STAGING_DIR)/usr/include" CFLAGS="-I$(STAGING_DIR)/usr/include -fno-builtin -fno-rtti -nostdinc++"
mkdir -p $(PKG_INSTALL_DIR)/usr/bin mkdir -p $(PKG_INSTALL_DIR)/usr/bin
endef endef

View File

@ -1,6 +1,7 @@
diff -Nur cbtt80-20060211-src/Makefile cbtt80-20060211-src.patched/Makefile Index: cbtt80-20060727-src/Makefile
--- cbtt80-20060211-src/Makefile 2006-02-07 18:44:58.000000000 +0100 ===================================================================
+++ cbtt80-20060211-src.patched/Makefile 2006-03-15 09:01:35.000000000 +0100 --- cbtt80-20060727-src.orig/Makefile 2007-08-27 23:41:22.000000000 +0200
+++ cbtt80-20060727-src/Makefile 2007-08-27 23:41:22.000000000 +0200
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
SHELL = /bin/sh SHELL = /bin/sh
SYSTEM = $(shell uname) SYSTEM = $(shell uname)
@ -8,7 +9,7 @@ diff -Nur cbtt80-20060211-src/Makefile cbtt80-20060211-src.patched/Makefile
DFLAGS = DFLAGS =
OFLAGS = -O2 -w OFLAGS = -O2 -w
LFLAGS = -L. -lz LFLAGS = -L. -lz
@@ -40,19 +39,19 @@ @@ -42,19 +41,19 @@
all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS) all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
./bnbt: $(OBJS) $(OBJS_BNBT) ./bnbt: $(OBJS) $(OBJS_BNBT)
@ -32,10 +33,3 @@ diff -Nur cbtt80-20060211-src/Makefile cbtt80-20060211-src.patched/Makefile
./bnbt: $(OBJS) $(OBJS_BNBT) ./bnbt: $(OBJS) $(OBJS_BNBT)
@@ -91,4 +90,4 @@
bnbt_mysql.mysql.o: bnbt.h bnbt_mysql.h util.h
tracker.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h config.h md5.h server.h sort.h tracker.h util.h
tracker_announce.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h link.h tracker.h util.h
-tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h
\ No newline at end of file
+tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h