diff options
Diffstat (limited to 'package/libsigc++')
| -rw-r--r-- | package/libsigc++/Config.in | 25 | ||||
| -rw-r--r-- | package/libsigc++/Makefile | 29 | ||||
| -rw-r--r-- | package/libsigc++/patches/patch-Makefile_in | 32 |
3 files changed, 23 insertions, 63 deletions
diff --git a/package/libsigc++/Config.in b/package/libsigc++/Config.in deleted file mode 100644 index cf47fe9bf..000000000 --- a/package/libsigc++/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config ADK_PACKAGE_LIBSIGCXX - prompt "libsigc++......................... Callback framework for C++" - tristate - depends on ADK_CXX - default n - help - Callback framework for C++ - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_LIBSIGCXX -default ADK_COMPILE_LIBSIGCXX_WITH_STDCXX if ADK_TARGET_LIB_GLIBC -default ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_LIBSIGCXX_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile index e056aab28..f19f49e5f 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 @@ -14,33 +14,10 @@ PKG_SITES:= ${MASTER_SITE_GNOME:=libsigc++/2.2/} include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) -PKG_DEPENDS:= uclibc++ -else -PKG_DEPENDS:= libstdcxx -endif - $(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" -endif - -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto confprog - -ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif - post-install: ${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib - ${CP} ${WRKINST}/usr/lib/libsigc-2.0.so.* ${IDIR_LIBSIGCXX}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libsigc-2.0.so* ${IDIR_LIBSIGCXX}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk 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 |