From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 24 Jul 2010 21:38:10 +0000 (+0000)
Subject: [package] uclibc++: parallel build fix
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=63cbf408ca20b6d302eccbb4a75861e416c06b31;p=packages.git

[package] uclibc++: parallel build fix

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22381 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 5e32966da..8351c9249 100644
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -17,6 +17,8 @@ PKG_MD5SUM:=1ceef3209cca88be8f1bd9de99735954
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION)
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/uclibcxx
@@ -60,18 +62,11 @@ define Build/Configure
 	fi
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(MAKE_FLAGS) \
-		DESTDIR="$(PKG_INSTALL_DIR)/usr" \
-		all install
-endef
-
 define Build/InstallDev
 	$(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/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(2)/bin/
+	$(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include/uClibc++/
+	$(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++*.a $(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++ 
@@ -83,8 +78,8 @@ endef
 
 define Package/uclibcxx/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++-*.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++-*.so $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,uclibcxx))