cbtt:

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

SVN-Revision: 8510

diff --git a/net/cbtt/Makefile b/net/cbtt/Makefile
index b72797f9f948b1cd8d0f3345239ff028fa2c2341..a8f87b7f6b09ccb19048c02a83ee60a2a4c7e701 100644 (file)
--- a/net/cbtt/Makefile
+++ b/net/cbtt/Makefile
@@ -8,28 +8,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cbtt
 include $(TOPDIR)/rules.mk
 
 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_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)80-$(PKG_VERSION)-src
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 

-PKG_BUILD_DEPENDS=zlib libmysqlclient
-

 define Package/cbtt
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=zlib
   MENU:=1
   TITLE:=Bittorrent tracker
 define Package/cbtt
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=zlib
   MENU:=1
   TITLE:=Bittorrent tracker

-  DEPENDS:=+libpthread
+  DEPENDS:=+libpthread +uclibcxx

   DESCRIPTION:=a C BitTorrent Tracker
   URL:=http://bnbtusermods.sourceforge.net
 endef
   DESCRIPTION:=a C BitTorrent Tracker
   URL:=http://bnbtusermods.sourceforge.net
 endef


@@ -37,7 +34,7 @@ endef
 define Package/cbtt-mysql
   SECTION:=net
   CATEGORY:=Network
 define Package/cbtt-mysql
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=cbtt +libmysqlclient +libpthread
+  DEPENDS:=cbtt +libmysqlclient

   TITLE:=Bittorrent tracker with mysql support
   DESCRIPTION:=Bittorrent tracker with mysql support
   URL:=http://bnbtusermods.sourceforge.net
   TITLE:=Bittorrent tracker with mysql support
   DESCRIPTION:=Bittorrent tracker with mysql support
   URL:=http://bnbtusermods.sourceforge.net


@@ -48,8 +45,8 @@ define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               LFLAGS="-L$(STAGING_DIR)/usr/lib -L $(STAGING_DIR)/usr/lib/mysql -L. -lz -lmysqlclient -lpthread" \
-               CFLAGS="-I$(STAGING_DIR)/usr/include"
+               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 -fno-builtin -fno-rtti -nostdinc++"

        mkdir -p $(PKG_INSTALL_DIR)/usr/bin
 endef
 
        mkdir -p $(PKG_INSTALL_DIR)/usr/bin
 endef
 

diff --git a/net/cbtt/patches/100-compile.patch b/net/cbtt/patches/100-compile.patch
index b767dfb3f91afd08d787b712bac06346c216218c..4181d8d643dab58ce9db446563ba40de40e20727 100644 (file)
--- a/net/cbtt/patches/100-compile.patch
+++ b/net/cbtt/patches/100-compile.patch
@@ -1,6 +1,7 @@
-diff -Nur cbtt80-20060211-src/Makefile cbtt80-20060211-src.patched/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
+Index: cbtt80-20060727-src/Makefile
+===================================================================
+--- 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 @@
  SHELL = /bin/sh
  SYSTEM = $(shell uname)
 @@ -1,6 +1,5 @@
  SHELL = /bin/sh
  SYSTEM = $(shell uname)


@@ -8,7 +9,7 @@ diff -Nur cbtt80-20060211-src/Makefile cbtt80-20060211-src.patched/Makefile
  DFLAGS =
  OFLAGS = -O2 -w
  LFLAGS = -L. -lz
  DFLAGS =
  OFLAGS = -O2 -w
  LFLAGS = -L. -lz

-@@ -40,19 +39,19 @@
+@@ -42,19 +41,19 @@

  all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
  
  ./bnbt: $(OBJS) $(OBJS_BNBT)
  all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
  
  ./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