Fix recursive libpthread dependency on libpthread

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

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 5c49d6306635be6e41421444be21dfb62830750a..27bfb76f74a10a1db74b14b708b49014818d59f4 100644 (file)
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -41,12 +41,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)" \
        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 \
@@ -64,27 +69,18 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(2)/bin
+       $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/
-       mkdir -p $(1)/usr/include/uClibc++
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/
-       mkdir -p $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/
-       $(SED) 's|-I/include/|-I$(1)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
-       $(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(2)/bin/g++-uc
+       $(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 Build/UninstallDev
-       rm -rf $(2)/bin/g++-uc \
-               $(2)/bin/g++-uc+std \
-               $(1)/usr/include/uClibc++ \
-               $(1)/usr/lib/libuClibc++*.{a,so*}
-endef
 
 define Package/uclibcxx/install
        $(INSTALL_DIR) $(1)/usr/lib