projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dnsmasq: full: disable ipset support by default
[openwrt/staging/mkresin.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index f31d9bb113e25f83475177ca83125d98ba9346a6..8d4f61921192c92fd771800c092e1cc0cefff5be 100644
(file)
--- a/
rules.mk
+++ b/
rules.mk
@@
-27,7
+27,7
@@
empty:=
space:= $(empty) $(empty)
comma:=,
merge=$(subst $(space),,$(1))
space:= $(empty) $(empty)
comma:=,
merge=$(subst $(space),,$(1))
-confvar=$(shell echo '$(foreach v,$(1),$(v)=$(subst ','\'',$($(v))))' | $(
STAGING_DIR_HOST)/bin/mkhash
md5)
+confvar=$(shell echo '$(foreach v,$(1),$(v)=$(subst ','\'',$($(v))))' | $(
MKHASH)
md5)
strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
paren_left = (
strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
paren_left = (
@@
-138,11
+138,7
@@
else
endif
ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
endif
ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
- ifeq ($(CONFIG_GCC_USE_IREMAP),y)
- iremap = -iremap$(1):$(2)
- else
- iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2)
- endif
+ iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2)
endif
PACKAGE_DIR:=$(BIN_DIR)/packages
endif
PACKAGE_DIR:=$(BIN_DIR)/packages
@@
-244,6
+240,7
@@
export PKG_CONFIG
HOSTCC:=gcc
HOSTCXX:=g++
HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
HOSTCC:=gcc
HOSTCXX:=g++
HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
+HOST_CXXFLAGS:=
HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib)
HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib)
@@
-266,6
+263,9
@@
TARGET_CXX:=$(TARGET_CROSS)g++
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e
+MKHASH:=$(STAGING_DIR_HOST)/bin/mkhash
+# MKHASH is used in /scripts, so we export it here.
+export MKHASH
CP:=cp -fpR
LN:=ln -sf
XARGS:=xargs -r
CP:=cp -fpR
LN:=ln -sf
XARGS:=xargs -r
@@
-274,7
+274,7
@@
BASH:=bash
TAR:=tar
FIND:=find
PATCH:=patch
TAR:=tar
FIND:=find
PATCH:=patch
-PYTHON:=python
+PYTHON:=python
3
INSTALL_BIN:=install -m0755
INSTALL_SUID:=install -m4755
INSTALL_BIN:=install -m0755
INSTALL_SUID:=install -m4755
@@
-339,6
+339,12
@@
else
$(SCRIPT_DIR)/rstrip.sh
endif
$(SCRIPT_DIR)/rstrip.sh
endif
+NINJA = \
+ MAKEFLAGS="$(MAKE_JOBSERVER)" \
+ $(STAGING_DIR_HOST)/bin/ninja \
+ $(if $(findstring c,$(OPENWRT_VERBOSE)),-v) \
+ $(if $(MAKE_JOBSERVER),,-j1)
+
ifeq ($(CONFIG_IPV6),y)
DISABLE_IPV6:=
else
ifeq ($(CONFIG_IPV6),y)
DISABLE_IPV6:=
else
@@
-399,7
+405,7
@@
endef
# $(2) => If set, recurse into subdirectories
define sha256sums
(cd $(1); find . $(if $(2),,-maxdepth 1) -type f -not -name 'sha256sums' -printf "%P\n" | sort | \
# $(2) => If set, recurse into subdirectories
define sha256sums
(cd $(1); find . $(if $(2),,-maxdepth 1) -type f -not -name 'sha256sums' -printf "%P\n" | sort | \
- xargs -r $(
STAGING_DIR_HOST)/bin/mkhash
-n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums)
+ xargs -r $(
MKHASH)
-n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums)
endef
# file extension
endef
# file extension