projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid a race condition that might lead to dnsmasq reading an empty resolv.conf (...
[openwrt.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index a8d3647b6dd480e17b259870417637cded526bdc..6fbf88f801f21113335ed2e733670d966479d447 100644
(file)
--- a/
rules.mk
+++ b/
rules.mk
@@
-5,10
+5,12
@@
# See /LICENSE for more information.
#
# See /LICENSE for more information.
#
--include $(TOPDIR)/.config
+ifeq ($(DUMP),)
+ -include $(TOPDIR)/.config
+endif
include $(TOPDIR)/include/verbose.mk
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)))
ARCH:=$(strip $(subst ",, $(CONFIG_ARCH)))
TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION)))
@@
-22,29
+24,33
@@
OPTIMIZE_FOR_CPU:=$(ARCH)
DL_DIR:=$(TOPDIR)/dl
INCLUDE_DIR:=$(TOPDIR)/include
SCRIPT_DIR:=$(TOPDIR)/scripts
DL_DIR:=$(TOPDIR)/dl
INCLUDE_DIR:=$(TOPDIR)/include
SCRIPT_DIR:=$(TOPDIR)/scripts
-TOOL_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
+TOOL_BUILD_DIR:=$(TOPDIR)/tool_build
+TOOLCHAIN_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
STAGING_DIR:=$(TOPDIR)/staging_dir_$(ARCH)
BIN_DIR:=$(TOPDIR)/bin
PACKAGE_DIR:=$(BIN_DIR)/packages
IPKG_TARGET_DIR:=$(PACKAGE_DIR)
BUILD_DIR:=$(TOPDIR)/build_$(ARCH)
STAGING_DIR:=$(TOPDIR)/staging_dir_$(ARCH)
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:=$(
TOP
DIR)/tmp
STAMP_DIR:=$(BUILD_DIR)/stamp
TARGET_DIR:=$(BUILD_DIR)/root
IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
STAMP_DIR:=$(BUILD_DIR)/stamp
TARGET_DIR:=$(BUILD_DIR)/root
IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
-REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
-GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+ REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
+ GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
+ TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
+endif
+
IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
+TARGET_PATH:=$(STAGING_DIR)/usr/
sbin:$(STAGING_DIR)/usr/
bin:$(STAGING_DIR)/bin:$(PATH)
TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
export PATH:=$(TARGET_PATH)
LINUX_DIR:=$(BUILD_DIR)/linux
TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
export PATH:=$(TARGET_PATH)
LINUX_DIR:=$(BUILD_DIR)/linux
-LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
+LINUX_HEADERS_DIR:=$(TOOL
CHAIN
_BUILD_DIR)/linux
# APPLICATIONS #
HOSTCC:=gcc
# APPLICATIONS #
HOSTCC:=gcc
@@
-54,26
+60,20
@@
PATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR)/bin/sed -i -e
CP:=cp -fpR
SED:=$(STAGING_DIR)/bin/sed -i -e
CP:=cp -fpR
+INSTALL_BIN:=install -m0755
+INSTALL_DIR:=install -d -m0755
+INSTALL_DATA:=install -m0644
+INSTALL_CONF:=install -m0600
+
ifneq ($(CONFIG_CCACHE),)
# FIXME: move this variable to a better location
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
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:=$(HOST_ARCH)-pc-linux-gnu
+EXTRA_CPPFLAGS := -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS := $(EXTRA_CPPFLAGS)
+EXTRA_LDFLAGS := -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
TARGET_CONFIGURE_OPTS:= \
AR=$(TARGET_CROSS)ar \
TARGET_CONFIGURE_OPTS:= \
AR=$(TARGET_CROSS)ar \
@@
-84,16
+84,21
@@
TARGET_CONFIGURE_OPTS:= \
GCC="$(TARGET_CC)" \
CXX=$(TARGET_CROSS)g++ \
RANLIB=$(TARGET_CROSS)ranlib \
GCC="$(TARGET_CC)" \
CXX=$(TARGET_CROSS)g++ \
RANLIB=$(TARGET_CROSS)ranlib \
- STRIP=$(TARGET_CROSS)strip
+ STRIP=$(TARGET_CROSS)strip \
+ OBJCOPY=$(TARGET_CROSS)objcopy \
+ OBJDUMP=$(TARGET_CROSS)objdump \
+ SIZE=$(TARGET_CROSS)size
# strip an entire directory
RSTRIP:= \
# strip an entire directory
RSTRIP:= \
+ NM="$(TARGET_CROSS)nm" \
STRIP="$(STRIP)" \
STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
$(SCRIPT_DIR)/rstrip.sh
# where to build (and put) .ipk packages
IPKG:= \
STRIP="$(STRIP)" \
STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
$(SCRIPT_DIR)/rstrip.sh
# 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 \
IPKG_TMP=$(BUILD_DIR)/tmp \
IPKG_INSTROOT=$(TARGET_DIR) \
IPKG_CONF_DIR=$(STAGING_DIR)/etc \
@@
-102,7
+107,7
@@
IPKG:= \
# invoke ipkg-build with some default options
IPKG_BUILD:= \
# invoke ipkg-build with some default options
IPKG_BUILD:= \
- ipkg-build -c -o
root -g root
+ ipkg-build -c -o
0 -g 0
ifeq ($(CONFIG_ENABLE_LOCALE),true)
DISABLE_NLS:=
ifeq ($(CONFIG_ENABLE_LOCALE),true)
DISABLE_NLS:=
@@
-115,11
+120,20
@@
ifneq ($(CONFIG_LARGEFILE),y)
endif
ifeq ($(CONFIG_TAR_VERBOSITY),y)
endif
ifeq ($(CONFIG_TAR_VERBOSITY),y)
- TAR_OPTIONS
=-xvf
+ TAR_OPTIONS
:=-xvf -
else
else
- TAR_OPTIONS
=-xf
+ TAR_OPTIONS
:=-xf -
endif
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
all:
FORCE: ;
.PHONY: FORCE