diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-07 18:28:06 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 11:34:00 +0200 |
| commit | c65601de77314c012638d6afaa65ecf30f9945de (patch) | |
| tree | e11158091381abcb219ab62780f028dcbafef2e0 /rules | |
| parent | 7cb199ebc41068bf1c06b4885776659c18361bfb (diff) | |
| download | OSELAS.Toolchain-c65601de77314c012638d6afaa65ecf30f9945de.tar.gz OSELAS.Toolchain-c65601de77314c012638d6afaa65ecf30f9945de.tar.xz | |
cross-gcc: drop special suffix handling
There have been no special linaro gcc releases for some time so this is no
longer needed. Also, cross-gcc-first had a different condition, which is
broken because the two packages share the URLs.
Also drop the old URLs that are no longer needed.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/cross-gcc-first.make | 4 | ||||
| -rw-r--r-- | rules/cross-gcc.make | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make index 626427a..3c3ee53 100644 --- a/rules/cross-gcc-first.make +++ b/rules/cross-gcc-first.make @@ -18,11 +18,7 @@ CROSS_GCC_FIRST_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GCC_VERSION)) CROSS_GCC_FIRST_DL_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GCC_DL_VERSION)) CROSS_GCC_FIRST_MD5 := $(call remove_quotes,$(PTXCONF_CROSS_GCC_MD5)) CROSS_GCC_FIRST := gcc-$(CROSS_GCC_FIRST_DL_VERSION) -ifeq ($(CROSS_GCC_FIRST_VERSION),$(CROSS_GCC_FIRST_DL_VERSION)) -CROSS_GCC_FIRST_SUFFIX := tar.bz2 -else CROSS_GCC_FIRST_SUFFIX := tar.xz -endif CROSS_GCC_FIRST_SOURCE := $(SRCDIR)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX) CROSS_GCC_FIRST_DIR := $(CROSS_BUILDDIR)/gcc-first-$(CROSS_GCC_FIRST_VERSION) CROSS_GCC_FIRST_BUILDDIR := $(CROSS_GCC_FIRST_DIR)-build diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make index 3ba19a7..b37a912 100644 --- a/rules/cross-gcc.make +++ b/rules/cross-gcc.make @@ -19,11 +19,7 @@ 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_DL_VERSION) -ifneq ($(filter linaro%,$(CROSS_GCC_DL_VERSION)),) -CROSS_GCC_SUFFIX := tar.bz2 -else CROSS_GCC_SUFFIX := tar.xz -endif CROSS_GCC_SOURCE := $(SRCDIR)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) CROSS_GCC_DIR := $(BUILDDIR_CROSS_DEBUG)/$(CROSS_GCC) CROSS_GCC_BUILDDIR := $(CROSS_BUILDDIR)/$(CROSS_GCC)-build @@ -34,10 +30,7 @@ CROSS_GCC_LICENSE_FILES := $(call remove_quotes,$(PTXCONF_CROSS_GCC_LICENSE_FILE CROSS_GCC_URL := \ $(call ptx/mirror, GNU, gcc/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX)) \ https://sourceware.org/pub/gcc/snapshots/$(CROSS_GCC_DL_VERSION)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ - https://sourceware.org/pub/gcc/releases/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ - http://launchpad.net/gcc-linaro/4.8/$(subst linaro-,,$(CROSS_GCC_DL_VERSION))/+download/gcc-$(CROSS_GCC_DL_VERSION).$(CROSS_GCC_SUFFIX) \ - http://launchpad.net/gcc-linaro/4.7/$(subst linaro-,,$(CROSS_GCC_DL_VERSION))/+download/gcc-$(CROSS_GCC_DL_VERSION).$(CROSS_GCC_SUFFIX) \ - http://launchpad.net/gcc-linaro/4.6/$(subst linaro-,,$(CROSS_GCC_DL_VERSION))/+download/gcc-$(CROSS_GCC_DL_VERSION).$(CROSS_GCC_SUFFIX) + https://sourceware.org/pub/gcc/releases/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) ptx/abs2rel := $(PTXDIST_WORKSPACE)/scripts/ptxd_abs2rel.sh |