summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-10 22:24:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-10 22:24:28 +0000
commit3c87508f9886b560b0c336f5531b63107c56c722 (patch)
treee16bde3c258ed7a59f4cab549bfa123248264f42 /package
parent8171f3fbb7b85ed7940b6605a2ab34f204f5107c (diff)
toolchain: remove target dependencies on libgcc/libgfortran, add checks to package install template instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32176 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/toolchain/Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/package/toolchain/Makefile b/package/toolchain/Makefile
index 227f302a9..c8105c30d 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