From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 22 Sep 2007 03:54:17 +0000 (+0000)
Subject: add another wrapper (like g++-uc) to link against both uClibc++ and libstdc++, remove... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bb1729411e3c864e807c6c24ae3043f4309a3c44;p=openwrt%2Fsvn-archive%2Farchive.git

add another wrapper (like g++-uc) to link against both uClibc++ and libstdc++, remove the wrapper symlink in $(STAGING_DIR_HOST) since it is compiler dependent.


SVN-Revision: 8940
---

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 17716ba7e6..7c0a5f506b 100644
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -62,7 +62,6 @@ define Build/Compile
 		$(MAKE_FLAGS) \
 		DESTDIR="$(PKG_INSTALL_DIR)/usr" \
 		all install
-		
 endef
 
 define Build/InstallDev
@@ -72,20 +71,20 @@ define Build/InstallDev
 	$(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/ \
-	)
+	$(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
+# add another wrapper which links against both uClibc++ and libstdc++ 
+	$(CP) $(STAGING_DIR)/usr/bin/g++-uc $(STAGING_DIR)/usr/bin/g++-uc+std
+	$(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(STAGING_DIR)/usr/bin/g++-uc+std
+	$(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(STAGING_DIR)/usr/bin/g++-uc+std
+	$(SED) 's|-nostdinc++||g' $(STAGING_DIR)/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