Merge branch 'qstrip' of git://git.busybox.net/~tpetazzoni/git/buildroot (0642da78) · Commits · Dom Sekotill / buildroot

Makefile

+5 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,10 @@ else
		BR2_LOCAL:=$(TOPDIR)/local
		endif

		# Strip quotes and then whitespaces
		qstrip=$(strip $(subst ",,$(1)))
		#"))

		# Variables for use in Make constructs
		comma:=,
		empty:=
		@@ -369,8 +373,7 @@ endif

		ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
		LOCALE_WHITELIST=$(PROJECT_BUILD_DIR)/locales.nopurge
		LOCALE_NOPURGE=$(strip $(subst ",,$(BR2_ENABLE_LOCALE_WHITELIST)))
		#"))
		LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))

		target-purgelocales:
		rm -f $(LOCALE_WHITELIST)

package/Makefile.autotools.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2)
		else
		define DOWNLOAD
		$(Q)test -e $(DL_DIR)/$(2) \|\| \
		for site in $(strip $(subst ",,$(BR2_PRIMARY_SITE))) $(1) $(strip $(subst ",,$(BR2_BACKUP_SITE))); \
		for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \
		do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
		endef
		endif

package/Makefile.in

+10 −16

Original line number	Diff line number	Diff line
		@@ -45,12 +45,10 @@ TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
		TARGET_LDFLAGS+= $(BR2_SYSROOT)
		endif

		CC_TARGET_TUNE_:=$(strip $(subst ",,$(BR2_GCC_TARGET_TUNE)))
		#"))
		CC_TARGET_ARCH_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ARCH)))
		#"))
		CC_TARGET_ABI_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ABI)))
		#"))
		CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
		CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
		CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))

		ifneq ($(CC_TARGET_TUNE_),)
		TARGET_CFLAGS+=-mtune=$(CC_TARGET_TUNE_)
		endif
		@@ -99,7 +97,7 @@ TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
		endif
		#########################################################################
		#ifeq ($(BR2_ROOTFS_SUFFIX),)
		ROOTFS_SUFFIX:=$(strip $(subst ",, $(BR2_ROOTFS_SUFFIX)))
		ROOTFS_SUFFIX:=$(call qstrip,$(BR2_ROOTFS_SUFFIX))
		ifeq ($(ROOTFS_SUFFIX),)
		ROOTFS_SUFFIX:=
		else
		@@ -107,7 +105,7 @@ XXXX=xxxx
		ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
		endif

		ifeq ($(strip $(subst ",, $(BR2_FPU_SUFFIX))),y)
		ifeq ($(call qstrip,$(BR2_FPU_SUFFIX)),y)
		COND_ARCH_FPU_SUFFIX:=$(ARCH_FPU_SUFFIX)
		else
		COND_ARCH_FPU_SUFFIX:=
		@@ -124,10 +122,8 @@ REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
		TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
		KERNEL_CROSS=$(TARGET_CROSS)
		else
		TOOLCHAIN_EXTERNAL_PREFIX:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PREFIX)))
		#"))
		TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH)))
		#"))
		TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
		TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
		#TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
		TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
		TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
		@@ -207,8 +203,7 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine \| sed -e s'/-.*//' \
		-e 's/i[3-9]86/i386/' \
		-e 's/xtensa.*/xtensa/' \
		)
		GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
		#")
		GNU_HOST_NAME:=$(HOST_ARCH)-$(call qstrip,$(BR2_GNU_BUILD_SUFFIX))

		TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
		AR="$(TARGET_AR)" \
		@@ -373,7 +368,6 @@ endif

		# X Windowing system

		X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))
		#"))
		X11_PREFIX:=$(call qstrip,$(BR2_X11_PREFIX))

		include package/Makefile.autotools.in

package/busybox/busybox.mk

+2 −4

Original line number	Diff line number	Diff line
		@@ -11,8 +11,7 @@ BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox
		BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
		BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
		else
		BUSYBOX_VERSION=$(strip $(subst ",, $(BR2_BUSYBOX_VERSION)))
		#"))
		BUSYBOX_VERSION=$(call qstrip,$(BR2_BUSYBOX_VERSION))
		BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox-$(BUSYBOX_VERSION)
		BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VERSION).tar.bz2
		BUSYBOX_SITE:=http://www.busybox.net/downloads
		@@ -21,8 +20,7 @@ endif
		BUSYBOX_UNZIP=$(BZCAT)

		ifndef BUSYBOX_CONFIG_FILE
		BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
		#")
		BUSYBOX_CONFIG_FILE=$(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
		endif

		$(DL_DIR)/$(BUSYBOX_SOURCE):

package/haserl/haserl.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,7 @@
		#
		#############################################################

		HASERL_VERSION:=$(strip $(subst ",,$(BR2_PACKAGE_HASERL_VERSION)))
		#"))
		HASERL_VERSION:=$(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
		HASERL_SOURCE:=haserl-$(HASERL_VERSION).tar.gz
		HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
		HASERL_AUTORECONF:=no