qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:35:55 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32176 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-06-10 22:24:28 +00:00
parent 8171f3fbb7
commit 3c87508f98
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/toolchain/Makefile
View File

@ -28,7 +28,6 @@ endef
define Package/libgcc define Package/libgcc
$(call Package/gcc/Default) $(call Package/gcc/Default)
TITLE:=GCC support library TITLE:=GCC support library
DEPENDS+=@!(TARGET_avr32||TARGET_coldfire)
endef endef
define Package/libgcc/config define Package/libgcc/config
@ -111,9 +110,7 @@ define Package/libc/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Base system CATEGORY:=Base system
VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE) VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
ifeq ($(TARGET_avr32)$(TARGET_coldfire),)
DEPENDS:=+libgcc DEPENDS:=+libgcc
endif
URL:=$(LIBC_URL) URL:=$(LIBC_URL)
PKG_FLAGS:=hold essential PKG_FLAGS:=hold essential
endef endef
@ -201,7 +198,7 @@ endef
define Package/libgfortran define Package/libgfortran
$(call Package/gcc/Default) $(call Package/gcc/Default)
TITLE:=GFortran support library TITLE:=GFortran support library
DEPENDS+=@!(TARGET_avr32||TARGET_coldfire) @INSTALL_GFORTRAN DEPENDS+=@INSTALL_GFORTRAN
endef endef
define Package/libgfortran/config define Package/libgfortran/config
@ -358,12 +355,12 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
define Package/libgcc/install define Package/libgcc/install
$(INSTALL_DIR) $(1)/lib $(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 endef
define Package/libgfortran/install define Package/libgfortran/install
$(INSTALL_DIR) $(1)/usr/lib $(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 endef
define Package/libssp/install define Package/libssp/install