From 1f1faff85a17fe457751ee1fa4ad6afa1b20c9d8 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Fri, 24 Aug 2007 05:27:17 +0000 Subject: [PATCH] Move VENDOR stuff to project --- project/Makefile.in | 19 +++++++++++++++++++ toolchain/Makefile.in | 17 ----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/project/Makefile.in b/project/Makefile.in index 3c73bb93d3..cbea29a389 100644 --- a/project/Makefile.in +++ b/project/Makefile.in @@ -13,6 +13,8 @@ WGET:=$(strip $(subst ",, $(BR2_WGET))) $(SPIDER) #")) SVN:=$(strip $(subst ",, $(BR2_SVN))) #")) +GIT:=$(strip $(subst ",, $(BR2_GIT))) +#")) ZCAT:=$(strip $(subst ",, $(BR2_ZCAT))) #")) BZCAT:=$(strip $(subst ",, $(BR2_BZCAT))) @@ -54,3 +56,20 @@ STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR))) PROJECT_BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)project_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)/$(PROJECT) BINARIES_DIR:=$(BASE_DIR)/binaries/$(PROJECT) TARGET_DIR:=$(PROJECT_BUILD_DIR)/root + +# define values for prepatched source trees for toolchains +VENDOR_SITE:=$(strip $(subst ",,$(BR2_VENDOR_SITE))) +#")) +VENDOR_SUFFIX:=$(strip $(subst ",,$(BR2_VENDOR_SUFFIX))) +#")) +VENDOR_BINUTILS_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_BINUTILS_RELEASE))) +#")) +VENDOR_GCC_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_GCC_RELEASE))) +#")) +VENDOR_UCLIBC_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_UCLIBC_RELEASE))) +#")) +VENDOR_GDB_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_GDB_RELEASE))) +#")) +VENDOR_PATCH_DIR:=$(strip $(subst ",,$(BR2_VENDOR_PATCH_DIR))) +#")) + diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in index 5e6ddb79cd..a3dff49d42 100644 --- a/toolchain/Makefile.in +++ b/toolchain/Makefile.in @@ -45,22 +45,5 @@ CFLAGS_WHOLE_PROGRAM = $(call cc-option,-fwhole-program,) # gcc-3.4 would need -combine, I only support 4.2, which correctly uses '--' CFLAGS_COMBINE = $(call cc-option,--combine,) -# define values for prepatched source trees for toolchains -#XXX: ulf, what about moving this to project/* ? (BF) -VENDOR_SITE:=$(strip $(subst ",,$(BR2_VENDOR_SITE))) -#")) -VENDOR_SUFFIX:=$(strip $(subst ",,$(BR2_VENDOR_SUFFIX))) -#")) -VENDOR_BINUTILS_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_BINUTILS_RELEASE))) -#")) -VENDOR_GCC_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_GCC_RELEASE))) -#")) -VENDOR_UCLIBC_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_UCLIBC_RELEASE))) -#")) -VENDOR_GDB_RELEASE:=$(strip $(subst ",,$(BR2_VENDOR_GDB_RELEASE))) -#")) -VENDOR_PATCH_DIR:=$(strip $(subst ",,$(BR2_VENDOR_PATCH_DIR))) -#")) - # gcc has a bunch of needed stuff.... include toolchain/gcc/Makefile.in -- 2.30.2