From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 3 Apr 2009 09:11:36 +0000 (+0000)
Subject: [package] compile libsigc++ with libsdtcpp instead of uClibc++
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=5e65c8c9077389e6cba8dd13e025c6e76b2c2929;p=packages.git

[package] compile libsigc++ with libsdtcpp instead of uClibc++

git-svn-id: svn://svn.openwrt.org/openwrt/packages@15086 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile
index 90443bc9c..43d8706ee 100644
--- a/libs/libsigc++/Makefile
+++ b/libs/libsigc++/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libsigc++
 PKG_VERSION:=2.2.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/
@@ -25,7 +25,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 +36,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