From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 13 May 2009 22:17:43 +0000 (+0000)
Subject: libsigc++, libtorrent, rtorrent: merge fixes from ./packages to 8.09 (closes: #4997... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5528d64a5f8bae85712232282916c6faadfda2ea;p=openwrt%2Fsvn-archive%2Fpackages.git

libsigc++, libtorrent, rtorrent: merge fixes from ./packages to 8.09 (closes: #4997) - link 'em all against libstdc++ only - add "-fno-strict-aliasing -fno-inline" flags - remove BROKEN status - bump release number

SVN-Revision: 15831
---

diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile
index 90443bc9c..7a8f7c0b5 100644
--- a/libs/libsigc++/Makefile
+++ b/libs/libsigc++/Makefile
@@ -4,13 +4,12 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsigc++
 PKG_VERSION:=2.2.3
-PKG_RELEASE:=1
+PKG_RELEASE:=1.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/
@@ -25,7 +24,7 @@ define Package/libsigcxx
   CATEGORY:=Libraries
   TITLE:=typesafe callback system for standard C++
   URL:=http://libsigc++.sourceforge.net/
-  DEPENDS:=+uclibcxx
+  DEPENDS:=+libstdcpp
 endef
 
 define Package/libsigcxx/description
@@ -36,16 +35,13 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
+TARGET_CPPFLAGS +=  \
+	-fno-strict-aliasing -fno-inline \
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 
-CONFIGURE_VARS += \
-	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
-	LDFLAGS="$$$$LDFLAGS" \
-	LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/libs/libsigc++/patches/001-no_doc_tests_examples.patch b/libs/libsigc++/patches/001-no_doc_tests_examples.patch
index 8304746ac..20c840f25 100644
--- a/libs/libsigc++/patches/001-no_doc_tests_examples.patch
+++ b/libs/libsigc++/patches/001-no_doc_tests_examples.patch
@@ -6,7 +6,7 @@ diff -urN libsigc++-2.2.3/Makefile.am libsigc++-2.2.3.new/Makefile.am
  # ACLOCAL_FLAGS = -I scripts
  
 -SUBDIRS      = sigc++ tests docs examples scripts MSVC_Net2005 MSVC_Net2008
-+SUBDIRS      = sigc++ scripts MSVC_Net2005 MSVC_Net2008
++SUBDIRS      = sigc++ scripts
  DIST_SUBDIRS = $(SUBDIRS)
  
  sigc_configdir = $(libdir)/sigc++-2.0/include
@@ -18,7 +18,7 @@ diff -urN libsigc++-2.2.3/Makefile.in libsigc++-2.2.3.new/Makefile.in
  EXTRA_DIST = autogen.sh sigc++config.h.in libsigc++-2.0.spec.in
  # ACLOCAL_FLAGS = -I scripts
 -SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2005 MSVC_Net2008
-+SUBDIRS = sigc++ scripts MSVC_Net2005 MSVC_Net2008
++SUBDIRS = sigc++ scripts
  DIST_SUBDIRS = $(SUBDIRS)
  sigc_configdir = $(libdir)/sigc++-2.0/include
  sigc_config_DATA = sigc++config.h
diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
index d6022d09d..4c0fceda0 100644
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -4,13 +4,12 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtorrent
 PKG_VERSION:=0.12.4
-PKG_RELEASE:=1
+PKG_RELEASE:=1.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads/
@@ -38,6 +37,9 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
+TARGET_CPPFLAGS +=  \
+        -fno-strict-aliasing -fno-inline \
+
 # XXX: rtorrent needs encryption (--enable-openssl)
 CONFIGURE_ARGS+= \
 	--enable-shared \
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 8432d0327..9506f728f 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -4,13 +4,12 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtorrent
 PKG_VERSION:=0.8.2
-PKG_RELEASE:=1
+PKG_RELEASE:=1.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads/
@@ -26,7 +25,7 @@ define Package/rtorrent
   CATEGORY:=Network
   TITLE:=BitTorrent client for ncurses
   URL:=http://libtorrent.rakshasa.no/
-  DEPENDS:=+libcurl +libtorrent +libncurses +libsigcxx @BROKEN
+  DEPENDS:=+libcurl +libtorrent +libncurses +libsigcxx
 endef
 
 define Package/rtorrent/description
@@ -36,14 +35,14 @@ define Package/rtorrent/description
  based clients in an ncurses client.
 endef
 
+TARGET_CPPFLAGS +=  \
+	-fno-strict-aliasing -fno-inline \
+
 CONFIGURE_ARGS+= \
 	--enable-shared \
 	--disable-static \
 	--disable-debug \
 
-CONFIGURE_VARS += \
-	LIBS="-lm -luClibc++" \
-
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \