[packages] bump release number for packages modified after 0.03

[openwrt/svn-archive/archive.git] / libs / uclibc++ / Makefile

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 1834645ccb3a3fdc0521de328e531ab9328e0a49..5e32966dac01ca84cb733ade2704e7cd20ae93e0 100644 (file)
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -1,21 +1,19 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uclibc++
 PKG_VERSION:=0.2.2
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://cxx.uclibc.org/src/
 PKG_MD5SUM:=1ceef3209cca88be8f1bd9de99735954
-PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION)
 
@@ -42,12 +40,17 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
        -e 's/cris.*/cris/' \
 )
 
+TARGET_CFLAGS += $(FPIC)
+
 MAKE_FLAGS:= \
        TOPDIR="$(PKG_BUILD_DIR)/" \
        $(TARGET_CONFIGURE_OPTS) \
-       ARCH_CFLAGS="$(TARGET_CFLAGS)" \
+       CPU_CFLAGS="$(TARGET_CFLAGS)" \
        CROSS="$(TARGET_CROSS)" \
        CP="$(CP)" \
+       $(if $(CONFIG_TARGET_avr32),check_as_needed=)
+
+# check_as_needed overrides dependency on libgcc_s
 
 define Build/Configure
        if [ -f ./files/config.$(UCLIBC_TARGET_ARCH) ]; then \
@@ -58,39 +61,24 @@ define Build/Configure
 endef
 
 define Build/Compile
-       # fix ccache issue
-       $(MAKE) -C $(PKG_BUILD_DIR)/src/abi/libsupc \
-               $(MAKE_FLAGS) \
-               CC="$(TARGET_CROSS)gcc" \
-               all
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(MAKE_FLAGS) \
                DESTDIR="$(PKG_INSTALL_DIR)/usr" \
                all install
-               
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(STAGING_DIR)/usr/bin/
-       mkdir -p $(STAGING_DIR)/usr/include/uClibc++
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/uClibc++/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(STAGING_DIR)/usr/lib/
-       $(SED) 's,-I/include/,-I$(STAGING_DIR)/usr/include/uClibc++/,g' $(STAGING_DIR)/usr/bin/g++-uc
-       $(SED) 's,-L/lib/,-L$(STAGING_DIR)/usr/lib/,g' $(STAGING_DIR)/usr/bin/g++-uc
-       $(if $(STAGING_DIR_HOST), \
-               ln -sf $(shell $(SCRIPT_DIR)/abs2rel.pl $(STAGING_DIR)/usr/bin/g++-uc $(STAGING_DIR_HOST)/bin/) $(STAGING_DIR_HOST)/bin/ \
-       )
-endef
-       
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/bin/g++-uc \
-               $(STAGING_DIR)/usr/include/uClibc++ \
-               $(STAGING_DIR)/usr/lib/libuClibc++*.{a,so*}
-       $(if $(STAGING_DIR_HOST), \
-               rm -f   $(STAGING_DIR_HOST)/bin/g++-uc \
-       )
+       $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/
+       $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
+       $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc
+# add another wrapper which links against both uClibc++ and libstdc++ 
+       $(INSTALL_BIN) $(2)/bin/g++-uc $(2)/bin/g++-uc+std
+       $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(2)/bin/g++-uc+std
+       $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(2)/bin/g++-uc+std
+       $(SED) 's|-nostdinc++||g' $(2)/bin/g++-uc+std
 endef
 
 define Package/uclibcxx/install