OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 138... Line 138...
138 TARGET_DIR_NAME:=target-$(GNU_TARGET_NAME)_$(LIBC)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) 138 TARGET_DIR_NAME:=target-$(GNU_TARGET_NAME)_$(LIBC)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
139 TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME) 139 TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME)
140 endif 140 endif
Line 141... Line 141...
141   141  
142 ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),) -  
143 ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y) -  
144 iremap = -fmacro-prefix-map=$(1)=$(2) -  
145 else 142 ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
146 iremap = -iremap$(1):$(2) -  
147 endif 143 iremap = -iremap$(1):$(2)
Line 148... Line 144...
148 endif 144 endif
149   145  
150 PACKAGE_DIR:=$(BIN_DIR)/packages 146 PACKAGE_DIR:=$(BIN_DIR)/packages
Line 181... Line 177...
181 LIBGCC_A=$(realpath $(lastword $(wildcard $(dir $(LIBGCC_S_PATH))/gcc/*/*/libgcc.a))) 177 LIBGCC_A=$(realpath $(lastword $(wildcard $(dir $(LIBGCC_S_PATH))/gcc/*/*/libgcc.a)))
182 else 178 else
183 LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a)) 179 LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a))
184 LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(LIBGCC_A)) 180 LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(LIBGCC_A))
185 endif 181 endif
-   182 LIBRPC=-lrpc
-   183 LIBRPC_DEPENDS=+librpc
Line 186... Line 184...
186   184  
187 ifeq ($(CONFIG_ARCH_64BIT),y) 185 ifeq ($(CONFIG_ARCH_64BIT),y)
188 LIB_SUFFIX:=64 186 LIB_SUFFIX:=64
Line 265... Line 263...
265   263  
266 TARGET_CC:=$(TARGET_CROSS)gcc 264 TARGET_CC:=$(TARGET_CROSS)gcc
267 TARGET_CXX:=$(TARGET_CROSS)g++ 265 TARGET_CXX:=$(TARGET_CROSS)g++
268 KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh 266 KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
269 SED:=$(STAGING_DIR_HOST)/bin/sed -i -e -  
270 ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e 267 SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
271 CP:=cp -fpR 268 CP:=cp -fpR
272 LN:=ln -sf 269 LN:=ln -sf
Line 273... Line 270...
273 XARGS:=xargs -r 270 XARGS:=xargs -r
Line 277... Line 274...
277 FIND:=find 274 FIND:=find
278 PATCH:=patch 275 PATCH:=patch
279 PYTHON:=python 276 PYTHON:=python
Line 280... Line 277...
280   277  
281 INSTALL_BIN:=install -m0755 -  
282 INSTALL_SUID:=install -m4755 278 INSTALL_BIN:=install -m0755
283 INSTALL_DIR:=install -d -m0755 279 INSTALL_DIR:=install -d -m0755
284 INSTALL_DATA:=install -m0644 280 INSTALL_DATA:=install -m0644
Line 285... Line 281...
285 INSTALL_CONF:=install -m0600 281 INSTALL_CONF:=install -m0600
Line 392... Line 388...
392 $(CP) $(1) $(2) 388 $(CP) $(1) $(2)
393 endef 389 endef
Line 394... Line 390...
394   390  
395 # Calculate sha256sum of any plain file within a given directory 391 # Calculate sha256sum of any plain file within a given directory
396 # $(1) => Input directory -  
397 # $(2) => If set, recurse into subdirectories 392 # $(1) => Input directory
398 define sha256sums 393 define sha256sums
399 (cd $(1); find . $(if $(2),,-maxdepth 1) -type f -not -name 'sha256sums' -printf "%P\n" | sort | \ 394 (cd $(1); find . -maxdepth 1 -type f -not -name 'sha256sums' -printf "%P\n" | sort | \
400 xargs -r $(STAGING_DIR_HOST)/bin/mkhash -n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums) 395 xargs -r $(STAGING_DIR_HOST)/bin/mkhash -n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums)
Line 401... Line 396...
401 endef 396 endef
402   397