From 15f7f8f402eab5b7cd03094c358435c4c880b5b6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 11:36:13 +0100 Subject: more bulk build fixes - update rtorrent, libtorrent and libsigc++ - add skeleton for cfinstaller - fix uclibc samba compile - fix parallel builds - update tcl - update iw - remove mac80211 package, use kernel integrated drivers - mark packages which can not be compiled parallel (make -j2) --- package/libsigc++/Config.in | 1 + package/libsigc++/Makefile | 6 +++--- package/libsigc++/patches/patch-Makefile_in | 32 ++++++++++++++++++----------- 3 files changed, 24 insertions(+), 15 deletions(-) (limited to 'package/libsigc++') diff --git a/package/libsigc++/Config.in b/package/libsigc++/Config.in index cf47fe9bf..3eb28a28e 100644 --- a/package/libsigc++/Config.in +++ b/package/libsigc++/Config.in @@ -20,6 +20,7 @@ config ADK_COMPILE_LIBSIGCXX_WITH_STDCXX config ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX bool "Embedded uClibc++ library" select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN help endchoice diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index e056aab28..eff341b7f 100644 --- a/package/libsigc++/Makefile +++ b/package/libsigc++/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libsigc++ -PKG_VERSION:= 2.2.2 +PKG_VERSION:= 2.2.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= e27a20ac9bc9100f48effdfca8e8c595 +PKG_MD5SUM:= a79b2fe9de69b40e020617c7a652d704 PKG_DESCR:= Callback framework for C++ PKG_SECTION:= libs PKG_URL:= http://libsigc.sourceforge.net @@ -30,7 +30,7 @@ endif CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto -INSTALL_STYLE:= auto confprog +INSTALL_STYLE:= auto ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ diff --git a/package/libsigc++/patches/patch-Makefile_in b/package/libsigc++/patches/patch-Makefile_in index 8a539b06b..a69fe45b0 100644 --- a/package/libsigc++/patches/patch-Makefile_in +++ b/package/libsigc++/patches/patch-Makefile_in @@ -1,12 +1,20 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libsigc++-2.2.2.orig/Makefile.in 2008-03-10 13:11:44.000000000 +0100 -+++ libsigc++-2.2.2/Makefile.in 2008-10-10 11:05:33.000000000 +0200 -@@ -206,7 +206,7 @@ top_srcdir = @top_srcdir@ - # other stuff here - EXTRA_DIST = autogen.sh sigc++config.h.in libsigc++-2.0.spec.in - # ACLOCAL_FLAGS = -I scripts --SUBDIRS = sigc++ tests docs examples scripts MSVC_Net2003 -+SUBDIRS = sigc++ scripts - DIST_SUBDIRS = $(SUBDIRS) - sigc_configdir = $(libdir)/sigc++-2.0/include - sigc_config_DATA = sigc++config.h +--- libsigc++-2.2.4.2.orig/Makefile.in 2009-09-02 17:55:19.000000000 +0200 ++++ libsigc++-2.2.4.2/Makefile.in 2009-11-20 20:31:56.000000000 +0100 +@@ -89,7 +89,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re + distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = sigc++ tests examples docs ++DIST_SUBDIRS = sigc++ + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -239,7 +239,7 @@ top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} + @ENABLE_DOCUMENTATION_FALSE@doc_subdirs = + @ENABLE_DOCUMENTATION_TRUE@doc_subdirs = docs +-SUBDIRS = sigc++ tests examples $(doc_subdirs) ++SUBDIRS = sigc++ + sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include + nodist_sigc_config_HEADERS = sigc++config.h + pkgconfigdir = $(libdir)/pkgconfig -- cgit v1.2.3