diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-08-22 21:41:40 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-08-22 21:41:40 +0000 |
| commit | 86c808e36190e1352161fa57874f86b1fda7e902 (patch) | |
| tree | 96efb0d11035c0901462a34c53e4f4537366ddbf /rules | |
| parent | 1169f44361170961c4e13c39e6e05f8ea6bfa899 (diff) | |
| download | OSELAS.Toolchain-86c808e36190e1352161fa57874f86b1fda7e902.tar.gz OSELAS.Toolchain-86c808e36190e1352161fa57874f86b1fda7e902.tar.xz | |
* glibc.make, glibc-ports.make:
added 2.8 support
git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7272 f8d472c7-5700-0410-ac5a-87979cec3adf
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/glibc-ports.make | 21 | ||||
| -rw-r--r-- | rules/glibc.make | 17 |
2 files changed, 30 insertions, 8 deletions
diff --git a/rules/glibc-ports.make b/rules/glibc-ports.make index 27a6507..28b9d9d 100644 --- a/rules/glibc-ports.make +++ b/rules/glibc-ports.make @@ -2,6 +2,7 @@ # $Id$ # # Copyright (C) 2006 by Robert Schwebel +# 2008 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -17,13 +18,26 @@ PACKAGES-$(PTXCONF_GLIBC_PORTS) += glibc-ports # # Paths and names # -GLIBC_PORTS_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_PORTS_VERSION)) -GLIBC_PORTS := glibc-ports-$(GLIBC_PORTS_VERSION) +ifdef PTXCONF_GLIBC_PORTS_VERSION +GLIBC_PORTS_VERSION := -$(call remove_quotes,$(PTXCONF_GLIBC_PORTS_VERSION)) +endif + +ifdef PTXCONF_GLIBC_TIMESTAMP +GLIBC_PORTS_TIMESTAMP := -$(call remove_quotes,$(PTXCONF_GLIBC_PORTS_TIMESTAMP)) +GLIBC_PORTS := glibc$(GLIBC_PORTS_VERSION)-ports$(GLIBC_PORTS_TIMESTAMP) +else +GLIBC_PORTS := glibc-ports$(GLIBC_PORTS_VRESION) +endif + GLIBC_PORTS_SUFFIX := tar.bz2 -GLIBC_PORTS_URL := $(PTXCONF_SETUP_GNUMIRROR)/glibc/$(GLIBC_PORTS).$(GLIBC_PORTS_SUFFIX) GLIBC_PORTS_SOURCE := $(SRCDIR)/$(GLIBC_PORTS).$(GLIBC_PORTS_SUFFIX) GLIBC_PORTS_DIR := $(BUILDDIR)/$(GLIBC_PORTS) +GLIBC_PORTS_URL := \ + $(PTXCONF_SETUP_GNUMIRROR)/glibc/$(GLIBC_PORTS).$(GLIBC_PORTS_SUFFIX) \ + ftp://sources.redhat.com/pub/glibc/snapshots/$(GLIBC_PORTS).$(GLIBC_PORTS_SUFFIX) \ + http://www.pengutronix.de/software/ptxdist/temporary-src/glibc/$(GLIBC_PORTS).$(GLIBC_PORTS_SUFFIX) + # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -85,7 +99,6 @@ $(STATEDIR)/glibc-ports.targetinstall: glibc-ports_clean: rm -rf $(STATEDIR)/glibc-ports.* - rm -rf $(IMAGEDIR)/glibc_ports_* rm -rf $(GLIBC_PORTS_DIR) # vim: syntax=make diff --git a/rules/glibc.make b/rules/glibc.make index f5280bc..47b7aee 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -18,14 +18,24 @@ PACKAGES-$(PTXCONF_GLIBC) += glibc # # Paths and names # -GLIBC_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION)) -GLIBC := glibc-$(GLIBC_VERSION) +ifdef PTXCONF_GLIBC_VERSION +GLIBC_VERSION := -$(call remove_quotes,$(PTXCONF_GLIBC_VERSION)) +endif +ifdef PTXCONF_GLIBC_TIMESTAMP +GLIBC_TIMESTAMP := -$(call remove_quotes,$(PTXCONF_GLIBC_TIMESTAMP)) +endif + +GLIBC := glibc$(GLIBC_VERSION)$(GLIBC_TIMESTAMP) GLIBC_SUFFIX := tar.bz2 -GLIBC_URL := $(PTXCONF_SETUP_GNUMIRROR)/glibc/$(GLIBC).$(GLIBC_SUFFIX) GLIBC_SOURCE := $(SRCDIR)/$(GLIBC).$(GLIBC_SUFFIX) GLIBC_DIR := $(BUILDDIR_DEBUG)/$(GLIBC) GLIBC_BUILDDIR := $(BUILDDIR)/$(GLIBC)-build +GLIBC_URL := \ + $(PTXCONF_SETUP_GNUMIRROR)/glibc/$(GLIBC).$(GLIBC_SUFFIX) \ + ftp://sources.redhat.com/pub/glibc/snapshots/$(GLIBC).$(GLIBC_SUFFIX) \ + http://www.pengutronix.de/software/ptxdist/temporary-src/glibc/$(GLIBC).$(GLIBC_SUFFIX) + # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -152,7 +162,6 @@ $(STATEDIR)/glibc.targetinstall: glibc_clean: rm -rf $(STATEDIR)/glibc.* - rm -rf $(IMAGEDIR)/glibc_* rm -rf $(GLIBC_DIR) # vim: syntax=make |