diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 10:46:42 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 10:50:11 +0100 |
| commit | 350e6eb3bd194492cf4991910c33eeecfcffcdb2 (patch) | |
| tree | 18c50861a8155d87d7ea1e8c4de33f63f2ba105d | |
| parent | 3f1531a6b88156cee42a19f6ab5f15ca6c66e522 (diff) | |
| download | OSELAS.Toolchain-350e6eb3bd194492cf4991910c33eeecfcffcdb2.tar.gz OSELAS.Toolchain-350e6eb3bd194492cf4991910c33eeecfcffcdb2.tar.xz | |
cross-gcc: add download version
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/cross-gcc.in | 13 | ||||
| -rw-r--r-- | rules/cross-gcc.make | 11 |
2 files changed, 19 insertions, 5 deletions
diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in index 4d28783..d936a39 100644 --- a/rules/cross-gcc.in +++ b/rules/cross-gcc.in @@ -25,6 +25,19 @@ config CROSS_GCC_MD5 string prompt "gcc source md5sum" +config CROSS_GCC_DL_VERSION + string + prompt "gcc download version" + default "${PTXCONF_CROSS_GCC_VERSION}" + help + The version of the downloaded archive. For some releases + such as Linaro gcc, this can differ from CROSS_GCC_VERSION + +config CROSS_GCC_PKGVERSION + string + default "${PTXCONF_PROJECT}" if CROSS_GCC_DL_VERSION = "${PTXCONF_CROSS_GCC_VERSION}" + default "${PTXCONF_PROJECT} ${PTXCONF_CROSS_GCC_DL_VERSION}" if CROSS_GCC_DL_VERSION != "${PTXCONF_CROSS_GCC_VERSION}" + config CROSS_GCC_43 bool prompt "additional deps for gcc >= 4.3" diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make index 284f254..7e36992 100644 --- a/rules/cross-gcc.make +++ b/rules/cross-gcc.make @@ -18,8 +18,9 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_GCC) += cross-gcc # Paths and names # CROSS_GCC_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GCC_VERSION)) +CROSS_GCC_DL_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GCC_DL_VERSION)) CROSS_GCC_MD5 := $(call remove_quotes,$(PTXCONF_CROSS_GCC_MD5)) -CROSS_GCC := gcc-$(CROSS_GCC_VERSION) +CROSS_GCC := gcc-$(CROSS_GCC_DL_VERSION) CROSS_GCC_SUFFIX := tar.bz2 CROSS_GCC_SOURCE := $(SRCDIR)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) CROSS_GCC_DIR := $(BUILDDIR_CROSS_DEBUG)/$(CROSS_GCC) @@ -27,10 +28,10 @@ CROSS_GCC_BUILDDIR := $(CROSS_BUILDDIR)/$(CROSS_GCC)-build CROSS_GCC_URL := \ $(PTXCONF_SETUP_GNUMIRROR)/gcc/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ - ftp://sourceware.org/pub/gcc/snapshots/$(CROSS_GCC_VERSION)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ + ftp://sourceware.org/pub/gcc/snapshots/$(CROSS_GCC_DL_VERSION)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ ftp://sourceware.org/pub/gcc/releases/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ - http://launchpad.net/gcc-linaro/4.5/$(subst linaro-,,$(CROSS_GCC_VERSION))/+download/gcc-$(CROSS_GCC_VERSION).tar.bz2 \ - http://launchpad.net/gcc-linaro/4.6/$(subst linaro-,,$(CROSS_GCC_VERSION))/+download/gcc-$(CROSS_GCC_VERSION).tar.bz2 + http://launchpad.net/gcc-linaro/4.5/$(subst linaro-,,$(CROSS_GCC_DL_VERSION))/+download/gcc-$(CROSS_GCC_DL_VERSION).tar.bz2 \ + http://launchpad.net/gcc-linaro/4.6/$(subst linaro-,,$(CROSS_GCC_DL_VERSION))/+download/gcc-$(CROSS_GCC_DL_VERSION).tar.bz2 ptx/abs2rel := $(PTXDIST_WORKSPACE)/scripts/ptxd_abs2rel.sh @@ -85,7 +86,7 @@ CROSS_GCC_AUTOCONF_COMMON := \ \ --enable-symvers=gnu \ \ - --with-pkgversion=${PTXCONF_PROJECT} \ + --with-pkgversion=$(PTXCONF_CROSS_GCC_PKGVERSION) \ --with-system-zlib ifdef PTXCONF_HOST_GMP |