From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 10 Jun 2012 22:24:28 +0000 (+0000)
Subject: toolchain: remove target dependencies on libgcc/libgfortran, add checks to package... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b2f70f0df02062c224a4496f5eb2a7691364e438;p=openwrt%2Fstaging%2Fldir.git

toolchain: remove target dependencies on libgcc/libgfortran, add checks to package install template instead

SVN-Revision: 32176
---

diff --git a/package/toolchain/Makefile b/package/toolchain/Makefile
index 227f302a9f..c8105c30d3 100644
--- a/package/toolchain/Makefile
+++ b/package/toolchain/Makefile
@@ -28,7 +28,6 @@ endef
 define Package/libgcc
 $(call Package/gcc/Default)
   TITLE:=GCC support library
-  DEPENDS+=@!(TARGET_avr32||TARGET_coldfire)
 endef
 
 define Package/libgcc/config
@@ -111,9 +110,7 @@ define Package/libc/Default
   SECTION:=libs
   CATEGORY:=Base system
   VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
-ifeq ($(TARGET_avr32)$(TARGET_coldfire),)
   DEPENDS:=+libgcc
-endif
   URL:=$(LIBC_URL)
   PKG_FLAGS:=hold essential
 endef
@@ -201,7 +198,7 @@ endef
 define Package/libgfortran
 $(call Package/gcc/Default)
   TITLE:=GFortran support library
-  DEPENDS+=@!(TARGET_avr32||TARGET_coldfire) @INSTALL_GFORTRAN
+  DEPENDS+=@INSTALL_GFORTRAN
 endef
 
 define Package/libgfortran/config
@@ -358,12 +355,12 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 
   define Package/libgcc/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
+	$(if $(TARGET_avr32)$(TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/)
   endef
 
   define Package/libgfortran/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(TOOLCHAIN_DIR)/lib/libgfortran.so.* $(1)/usr/lib/
+	$(if $(TARGET_avr32)$(TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgfortran.so.* $(1)/usr/lib/)
   endef
 
   define Package/libssp/install