packages: Use $(CP) instead of $(INSTALL_BIN) for binaries.

[packages.git] / libs / uclibc++ / Makefile

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 0bef008..fcfd48b 100644 (file)
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 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)
 
@@ -55,8 +54,6 @@ define Build/Configure
        else \
                cp ./files/config.default $(PKG_BUILD_DIR)/.config; \
        fi
-       # fix ccache issue
-       $(SED) 's,$$$$CC,$(TARGET_CROSS)gcc,g' $(PKG_BUILD_DIR)/scripts/find_lib*.sh
 endef
 
 define Build/Compile
@@ -64,30 +61,29 @@ define Build/Compile
                $(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/ \
-       )
+       mkdir -p $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(1)/usr/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' $(1)/usr/bin/g++-uc
+       $(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(1)/usr/bin/g++-uc
+# add another wrapper which links against both uClibc++ and libstdc++ 
+       $(INSTALL_BIN) $(1)/usr/bin/g++-uc $(1)/usr/bin/g++-uc+std
+       $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(1)/usr/bin/g++-uc+std
+       $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(1)/usr/bin/g++-uc+std
+       $(SED) 's|-nostdinc++||g' $(1)/usr/bin/g++-uc+std
 endef
        
 define Build/UninstallDev
        rm -rf  $(STAGING_DIR)/usr/bin/g++-uc \
+               $(STAGING_DIR)/usr/bin/g++-uc+std \
                $(STAGING_DIR)/usr/include/uClibc++ \
                $(STAGING_DIR)/usr/lib/libuClibc++*.{a,so*}
-       $(if $(STAGING_DIR_HOST), \
-               rm -f   $(STAGING_DIR_HOST)/bin/g++-uc \
-       )
 endef
 
 define Package/uclibcxx/install