remove python prereq check - no longer necessary

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index eebc758..d52539f 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -8,7 +8,7 @@
 -include $(TOPDIR)/.config
 include $(TOPDIR)/include/verbose.mk
 
-export SHELL=/bin/bash
+export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
 
 ARCH:=$(strip $(subst ",, $(CONFIG_ARCH)))
 TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION)))
@@ -29,7 +29,7 @@ BIN_DIR:=$(TOPDIR)/bin
 PACKAGE_DIR:=$(BIN_DIR)/packages
 IPKG_TARGET_DIR:=$(PACKAGE_DIR)
 BUILD_DIR:=$(TOPDIR)/build_$(ARCH)
-TMP_DIR:=$(BUILD_DIR)/tmp
+TMP_DIR:=$(TOPDIR)/tmp
 STAMP_DIR:=$(BUILD_DIR)/stamp
 TARGET_DIR:=$(BUILD_DIR)/root
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
@@ -60,25 +60,10 @@ CP:=cp -fpR
 
 ifneq ($(CONFIG_CCACHE),)
   # FIXME: move this variable to a better location
-  export CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH)
+  export CCACHE_DIR=$(STAGING_DIR)/ccache
   TARGET_CC:= ccache $(TARGET_CC)
 endif
 
-HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-       -e 's/sparc.*/sparc/' \
-       -e 's/arm.*/arm/' \
-       -e 's/m68k.*/m68k/' \
-       -e 's/ppc/powerpc/' \
-       -e 's/v850.*/v850/' \
-       -e 's/sh[234]/sh/' \
-       -e 's/mips-.*/mips/' \
-       -e 's/mipsel-.*/mipsel/' \
-       -e 's/cris.*/cris/' \
-       -e 's/i[3-9]86/i386/' \
-       )
-
-GNU_HOST_NAME:=$(shell $(HOSTCC) -dumpmachine)
-
 TARGET_CONFIGURE_OPTS:= \
   AR=$(TARGET_CROSS)ar \
   AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
@@ -98,6 +83,7 @@ RSTRIP:= \
 
 # where to build (and put) .ipk packages
 IPKG:= \
+  PATH="$(STAGING_DIR)/bin:$(PATH)" \
   IPKG_TMP=$(BUILD_DIR)/tmp \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_CONF_DIR=$(STAGING_DIR)/etc \
@@ -119,11 +105,21 @@ ifneq ($(CONFIG_LARGEFILE),y)
 endif
 
 ifeq ($(CONFIG_TAR_VERBOSITY),y)
-  TAR_OPTIONS=-xvf
+  TAR_OPTIONS:=-xvf -
 else
-  TAR_OPTIONS=-xf
+  TAR_OPTIONS:=-xf -
 endif
 
+define shvar
+V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+endef
+
+define shexport
+$(call shvar,$(1))=$$(call $(1))
+export $(call shvar,$(1))
+endef
+
+
 all:
 FORCE: ;
 .PHONY: FORCE