hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more shell related fixes

Browse Source 
SVN-Revision: 5509
master
Felix Fietkau 18 years ago
parent a264975480
commit 864ae8f613
3 changed files with 9 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      toolchain/gcc/Makefile
  2. 2
      toolchain/kernel-headers/Makefile
  3. 5
      tools/sed/Makefile

12
toolchain/gcc/Makefile
Unescape View File

@ -45,11 +45,10 @@ include $(INCLUDE_DIR)/host-build.mk
BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
BUILD_DIR2:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-final BUILD_DIR2:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-final
override SHELL:=$(BASH)
define Stage1/Configure define Stage1/Configure
mkdir -p $(BUILD_DIR1) mkdir -p $(BUILD_DIR1)
(cd $(BUILD_DIR1); rm -f config.cache; \ (cd $(BUILD_DIR1); rm -f config.cache; \
SHELL="$(BASH)" \
$(PKG_BUILD_DIR)/configure \ $(PKG_BUILD_DIR)/configure \
--prefix=$(STAGING_DIR) \ --prefix=$(STAGING_DIR) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
@ -65,10 +64,10 @@ define Stage1/Configure
); );
endef endef
define Stage1/Compile define Stage1/Compile
$(MAKE) -C $(BUILD_DIR1) all-gcc $(MAKE) -C $(BUILD_DIR1) all-gcc SHELL="$(BASH)"
endef endef
define Stage1/Install define Stage1/Install
$(MAKE) -C $(BUILD_DIR1) install-gcc $(MAKE) -C $(BUILD_DIR1) install-gcc SHELL="$(BASH)"
endef endef
define Stage2/Configure define Stage2/Configure
@ -79,6 +78,7 @@ define Stage2/Configure
rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
(cd $(BUILD_DIR2); rm -f config.cache; \ (cd $(BUILD_DIR2); rm -f config.cache; \
SHELL="$(BASH)" \
$(PKG_BUILD_DIR)/configure \ $(PKG_BUILD_DIR)/configure \
--prefix=$(STAGING_DIR) \ --prefix=$(STAGING_DIR) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
@ -93,10 +93,10 @@ define Stage2/Configure
); );
endef endef
define Stage2/Compile define Stage2/Compile
$(MAKE) -C $(BUILD_DIR2) all $(MAKE) -C $(BUILD_DIR2) all SHELL="$(BASH)"
endef endef
define Stage2/Install define Stage2/Install
$(MAKE) -C $(BUILD_DIR2) install $(MAKE) -C $(BUILD_DIR2) install SHELL="$(BASH)"
echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
# Set up the symlinks to enable lying about target name. # Set up the symlinks to enable lying about target name.
set -e; \ set -e; \

2
toolchain/kernel-headers/Makefile
Unescape View File

@ -29,7 +29,7 @@ define Build/Configure
-$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config -$(CP) ./files/config.$(LINUX_KARCH) $(PKG_BUILD_DIR)/.config
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
ARCH=$(LINUX_KARCH) \ ARCH=$(LINUX_KARCH) \
CONFIG_SHELL=$(shell which bash) \ CONFIG_SHELL=$(BASH) \
defconfig include/linux/version.h defconfig include/linux/version.h
endef endef

5
tools/sed/Makefile
Unescape View File

@ -18,10 +18,9 @@ PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
override SHELL:=$(BASH)
define Build/Configure define Build/Configure
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \ (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
SHELL="$(BASH)" \
./configure \ ./configure \
--prefix=$(STAGING_DIR) \ --prefix=$(STAGING_DIR) \
--prefix=/usr \ --prefix=/usr \
@ -29,7 +28,7 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR) SHELL="$(BASH)"
endef endef
define Build/Install define Build/Install

Write Preview
Loading…
Cancel
Save