diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-11-16 19:10:12 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-16 12:37:18 +0200 |
| commit | bbee926e7354e31cb88bcb88d6ebe2733128a7f2 (patch) | |
| tree | b918521dc46455078d233dc0842a0f25557ba0c7 /rules/uclibc.make | |
| parent | 4631764f7306a450b75711a7b5df0495cd722025 (diff) | |
| download | OSELAS.Toolchain-bbee926e7354e31cb88bcb88d6ebe2733128a7f2.tar.gz OSELAS.Toolchain-bbee926e7354e31cb88bcb88d6ebe2733128a7f2.tar.xz | |
uclibc: cleanup rules
Don't reuse the uclibc source tree in uclibc-headers.
It breaks 'ptxdist -j'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/uclibc.make')
| -rw-r--r-- | rules/uclibc.make | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/rules/uclibc.make b/rules/uclibc.make index 2a03bfe..8ce6fb3 100644 --- a/rules/uclibc.make +++ b/rules/uclibc.make @@ -20,7 +20,9 @@ UCLIBC_VERSION := $(call remove_quotes,$(PTXCONF_UCLIBC_VERSION)) UCLIBC_MD5 := $(call remove_quotes,$(PTXCONF_UCLIBC_MD5)) UCLIBC := uClibc-$(UCLIBC_VERSION) UCLIBC_SUFFIX := tar.bz2 -UCLIBC_URL := http://www.uclibc.org/downloads/$(UCLIBC).$(UCLIBC_SUFFIX) +UCLIBC_URL := \ + http://www.uclibc.org/downloads/$(UCLIBC).$(UCLIBC_SUFFIX) \ + http://www.uclibc.org/downloads/snapshots/$(UCLIBC).$(UCLIBC_SUFFIX) UCLIBC_SOURCE := $(SRCDIR)/$(UCLIBC).$(UCLIBC_SUFFIX) UCLIBC_DIR := $(BUILDDIR)/$(UCLIBC) UCLIBC_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/config/$(PTXCONF_UCLIBC_CONFIG)) @@ -29,8 +31,24 @@ UCLIBC_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/config/$(PTX # Prepare # ---------------------------------------------------------------------------- -UCLIBC_PATH := PATH=$(CROSS_PATH) -UCLIBC_ENV := KCONFIG_NOTIMESTAMP=1 $(HOST_ENV_CC) +UCLIBC_ENV := \ + $(HOST_ENV_CC) \ + KCONFIG_NOTIMESTAMP=1 \ + $(if $(filter 0,$(PTXDIST_VERBOSE)),V=) + +$(UCLIBC_CONFIG): + @echo + @echo "**************************************************************************" + @echo "**** Please generate a uclibc config with 'ptxdist menuconfig uclibc' ****" + @echo "**************************************************************************" + @echo + @echo + @exit 1 + +$(STATEDIR)/uclibc.prepare: $(UCLIBC_CONFIG) + @$(call targetinfo) + @$(call world/kconfig, UCLIBC, oldconfig) + @$(call touch) UCLIBC_MAKE_OPT := \ CROSS=$(COMPILER_PREFIX) \ @@ -43,28 +61,14 @@ UCLIBC_MAKE_OPT := \ UCLIBC_INSTALL_OPT := \ $(UCLIBC_MAKE_OPT) \ - DEVEL_PREFIX=/usr/ \ - PREFIX=$(SYSROOT) \ install -$(STATEDIR)/uclibc.prepare: $(STATEDIR)/uclibc-headers.install - # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- uclibc_oldconfig uclibc_menuconfig: $(STATEDIR)/uclibc.extract - @if test -e $(UCLIBC_CONFIG); then \ - cp $(UCLIBC_CONFIG) $(UCLIBC_DIR)/.config; \ - fi - - @cd $(UCLIBC_DIR) && \ - $(UCLIBC_PATH) $(UCLIBC_ENV) $(MAKE) $(UCLIBC_MAKEVARS) $(subst uclibc_,,$@) - - @if cmp -s $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG); then \ - echo "uclibc configuration unchanged"; \ - else \ - cp $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG); \ - fi + @$(call world/kconfig, UCLIBC, $(subst uclibc_,,$@)) + @$(call finish) # vim: syntax=make |