From b14a89bbd005449f9f8a3cebebc9f1f4988279f1 Mon Sep 17 00:00:00 2001 From: kyak Date: Tue, 23 Aug 2011 23:10:44 +0400 Subject: [PATCH 1/3] gcc-mips workaround --- .../etc/uci-defaults/04-gcc-mips-work-around | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around diff --git a/nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around b/nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around new file mode 100644 index 0000000..dabae92 --- /dev/null +++ b/nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around @@ -0,0 +1,9 @@ +#!/bin/sh + +#we use some files from host's openwrt toolchain for gcc-mips package, +#and the host's gcc version (linaro) is now 4.5.4. +#this will be fixed when we catch up with openwrt upstream, +#workaround for now +for i in $(find /usr/lib/gcc/mipsel-openwrt-linux-uclibc/4.5.4 -type f); do + ln -s $i ${i/4.5.4/4.5.2} +done From 1080cfe8812e5f6c98b85d12075aa4926f2221bc Mon Sep 17 00:00:00 2001 From: kyak Date: Tue, 23 Aug 2011 23:13:13 +0400 Subject: [PATCH 2/3] Revert "gcc-mips workaround" This reverts commit b14a89bbd005449f9f8a3cebebc9f1f4988279f1. Better do it in postinstall. Forgotten that gcc-mips is not in the image. --- .../etc/uci-defaults/04-gcc-mips-work-around | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around diff --git a/nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around b/nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around deleted file mode 100644 index dabae92..0000000 --- a/nanonote-files/script-files/etc/uci-defaults/04-gcc-mips-work-around +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -#we use some files from host's openwrt toolchain for gcc-mips package, -#and the host's gcc version (linaro) is now 4.5.4. -#this will be fixed when we catch up with openwrt upstream, -#workaround for now -for i in $(find /usr/lib/gcc/mipsel-openwrt-linux-uclibc/4.5.4 -type f); do - ln -s $i ${i/4.5.4/4.5.2} -done From a772fbe5e3ff90a8f35b10f776b70b8c9ca9b9c6 Mon Sep 17 00:00:00 2001 From: kyak Date: Wed, 24 Aug 2011 00:28:11 +0400 Subject: [PATCH 3/3] gcc-mips: temporary workaround --- gcc-mips/Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gcc-mips/Makefile b/gcc-mips/Makefile index 1063f12..3233b3e 100644 --- a/gcc-mips/Makefile +++ b/gcc-mips/Makefile @@ -99,4 +99,15 @@ define Package/gcc-mips/install cp -a $(TOOLCHAIN_DIR)/lib/*.{a,o,so*} $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) endef +define Package/gcc-mips/postinst +#!/bin/sh +#we use some files from host's openwrt toolchain for gcc-mips package, +#and the host's gcc version (linaro) is now 4.5.4. +#this will be fixed when we catch up with openwrt upstream, +#workaround for now +for i in $$(find $${IPKG_INSTROOT}/usr/lib/gcc/mipsel-openwrt-linux-uclibc/4.5.4 -type f); do + ln -s ../4.5.4/$${i##*/} $${i/4.5.4/4.5.2} +done +endef + $(eval $(call BuildPackage,gcc-mips))