From 01ed40ec23fdac372ea3de50a9bea06fa1a6718f Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 14 Jul 2008 23:24:58 +0000 Subject: [PATCH] use qstrip macro to strip quoted CONFIG_* strings git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11832 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/binutils/Makefile | 3 +-- toolchain/gcc/Makefile | 2 +- toolchain/uClibc/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 8682fa596..1023d9e67 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -7,8 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=binutils -PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION))) -#")) +PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION)) PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/binutils/ \ ftp://gatekeeper.dec.com/pub/GNU/ \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index ef5ab22d0..31697989c 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gcc -PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#")) +PKG_VERSION:=$(call qstrip,$(CONFIG_GCC_VERSION)) PATCH_DIR=./patches/$(PKG_VERSION) PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \ diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index e6f2b7b19..8c02489b1 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=uClibc -PKG_VERSION:=$(strip $(subst ",, $(CONFIG_UCLIBC_VERSION)))#")) -PKG_EXTRAVERSION:=$(strip $(subst ",, $(CONFIG_UCLIBC_EXTRA_VERSION)))#")) -PKG_VERSION_SNAPSHOT:=$(strip $(subst ",, $(CONFIG_UCLIBC_VERSION_SNAPSHOT)))#")) +PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) +PKG_EXTRAVERSION:=$(call qstrip,$(CONFIG_UCLIBC_EXTRA_VERSION)) +PKG_VERSION_SNAPSHOT:=$(call qstrip,$(CONFIG_UCLIBC_VERSION_SNAPSHOT)) ifeq ($(PKG_VERSION_SNAPSHOT),y) PKG_SOURCE_URL:=http://www.uclibc.org/downloads/snapshots else