glibc: update & cleanup rules

Don't reuse the glibc source tree in glibc-headers, glibc-crt and
glibc-first. It breaks 'ptxdist -j'.

Remove glibc-ports, it's no longer needed.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 48 insertions, 93 deletions

diff --git a/Kconfig b/Kconfig
index 019e454..b6bc4c3 100644
--- a/Kconfig
+++ b/Kconfig
@@ -40,7 +40,6 @@ source "workspace/rules/libc.in"
 
 if LIBC_GLIBC
 source "workspace/rules/glibc.in"
-source "workspace/rules/glibc-ports.in"
 endif
 
 if LIBC_UCLIBC
diff --git a/rules/glibc-crt.make b/rules/glibc-crt.make
index 8b4d90a..2fd0f03 100644
--- a/rules/glibc-crt.make
+++ b/rules/glibc-crt.make
@@ -17,7 +17,15 @@ PACKAGES-$(PTXCONF_GLIBC_CRT) += glibc-crt
 #
 # Paths and names
 #
-GLIBC_CRT_DIR	= $(BUILDDIR)/$(GLIBC)-crt-build
+GLIBC_CRT_VERSION	:= $(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
+GLIBC_CRT_MD5		:= $(call remove_quotes,$(PTXCONF_GLIBC_MD5))
+GLIBC_CRT		:= glibc-$(GLIBC_CRT_VERSION)
+GLIBC_CRT_SUFFIX	:= tar.bz2
+GLIBC_CRT_SOURCE	:= $(SRCDIR)/$(GLIBC_CRT).$(GLIBC_CRT_SUFFIX)
+GLIBC_CRT_DIR		:= $(BUILDDIR)/glibc-crt-$(GLIBC_CRT_VERSION)
+GLIBC_CRT_BUILDDIR	:= $(GLIBC_CRT_DIR)-build
+GLIBC_CRT_URL		 = $(GLIBC_URL)
+GLIBC_CRT_BUILD_OOT	:= YES
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -41,24 +49,15 @@ GLIBC_CRT_CONF_TOOL	:= autoconf
 GLIBC_CRT_CONF_OPT	= $(GLIBC_CONF_OPT)
 GLIBC_CRT_MAKE_OPT	:= csu/subdir_lib
 
-$(STATEDIR)/glibc-crt.prepare: $(STATEDIR)/glibc.extract
-	@$(call targetinfo)
-	@$(call clean, $(GLIBC_CRT_DIR))
-	mkdir -p $(GLIBC_CRT_DIR)
-	cd $(GLIBC_CRT_DIR) && \
-		$(GLIBC_CRT_PATH) $(GLIBC_CRT_ENV) \
-		$(GLIBC_DIR)/configure $(GLIBC_CRT_CONF_OPT)
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
 $(STATEDIR)/glibc-crt.install:
 	@$(call targetinfo)
-	mkdir -p $(SYSROOT)/usr/lib
-	for file in {S,}crt1.o crt{i,n}.o; do \
-		$(INSTALL) -m 644 $(GLIBC_CRT_DIR)/csu/$$file \
+	@mkdir -vp $(SYSROOT)/usr/lib
+	@for file in {S,}crt1.o crt{i,n}.o; do \
+		$(INSTALL) -v -m 644 $(GLIBC_CRT_BUILDDIR)/csu/$$file \
 			$(SYSROOT)/usr/lib/$$file || exit 1; \
 	done
 	@$(call touch)
diff --git a/rules/glibc-first.make b/rules/glibc-first.make
index f8c38f4..0796f7c 100644
--- a/rules/glibc-first.make
+++ b/rules/glibc-first.make
@@ -18,7 +18,15 @@ PACKAGES-$(PTXCONF_GLIBC_FIRST) += glibc-first
 #
 # Paths and names
 #
-GLIBC_FIRST_BUILDDIR	= $(BUILDDIR)/$(GLIBC)-first-build
+GLIBC_FIRST_VERSION	:= $(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
+GLIBC_FIRST_MD5		:= $(call remove_quotes,$(PTXCONF_GLIBC_MD5))
+GLIBC_FIRST		:= glibc-$(GLIBC_FIRST_VERSION)
+GLIBC_FIRST_SUFFIX	:= tar.bz2
+GLIBC_FIRST_SOURCE	:= $(SRCDIR)/$(GLIBC_FIRST).$(GLIBC_FIRST_SUFFIX)
+GLIBC_FIRST_DIR		:= $(BUILDDIR)/glibc-first-$(GLIBC_FIRST_VERSION)
+GLIBC_FIRST_BUILDDIR	:= $(GLIBC_FIRST_DIR)-build
+GLIBC_FIRST_URL		 = $(GLIBC_URL)
+GLIBC_FIRST_BUILD_OOT	:= YES
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -48,15 +56,6 @@ GLIBC_FIRST_CONF_OPT	 = \
 	--disable-debug \
 	--disable-profile \
 
-$(STATEDIR)/glibc-first.prepare: $(STATEDIR)/glibc.extract
-	@$(call targetinfo)
-	@$(call clean, $(GLIBC_FIRST_BUILDDIR))
-	mkdir -p $(GLIBC_FIRST_BUILDDIR)
-	cd $(GLIBC_FIRST_BUILDDIR) && \
-		$(GLIBC_FIRST_ENV) $(GLIBC_FIRST_PATH) \
-		$(GLIBC_DIR)/configure $(GLIBC_FIRST_CONF_OPT)
-	@$(call touch)
-
 GLIBC_FIRST_MAKE_OPT	:= \
 	AUTOCONF=no \
 	build-programs=no
diff --git a/rules/glibc-headers.make b/rules/glibc-headers.make
index 6ac7e10..038c2a8 100644
--- a/rules/glibc-headers.make
+++ b/rules/glibc-headers.make
@@ -18,7 +18,15 @@ PACKAGES-$(PTXCONF_GLIBC_HEADERS) += glibc-headers
 #
 # Paths and names
 #
-GLIBC_HEADERS_DIR	= $(BUILDDIR)/$(GLIBC)-headers-build
+GLIBC_HEADERS_VERSION	:= $(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
+GLIBC_HEADERS_MD5	:= $(call remove_quotes,$(PTXCONF_GLIBC_MD5))
+GLIBC_HEADERS		:= glibc-$(GLIBC_HEADERS_VERSION)
+GLIBC_HEADERS_SUFFIX	:= tar.bz2
+GLIBC_HEADERS_SOURCE	:= $(SRCDIR)/$(GLIBC_HEADERS).$(GLIBC_HEADERS_SUFFIX)
+GLIBC_HEADERS_DIR	:= $(BUILDDIR)/glibc-headers-$(GLIBC_HEADERS_VERSION)
+GLIBC_HEADERS_BUILDDIR	:= $(GLIBC_HEADERS_DIR)-build
+GLIBC_HEADERS_URL	 = $(GLIBC_URL)
+GLIBC_HEADERS_BUILD_OOT	:= YES
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -85,44 +93,35 @@ GLIBC_HEADERS_CONF_OPT	 = \
 	\
 	--enable-hacker-mode
 
-$(STATEDIR)/glibc-headers.prepare: $(STATEDIR)/glibc.extract
-	@$(call targetinfo)
-	@$(call clean, $(GLIBC_HEADERS_DIR))
-	mkdir -p $(GLIBC_HEADERS_DIR)
-	cd $(GLIBC_HEADERS_DIR) && \
-		$(GLIBC_HEADERS_PATH) $(GLIBC_HEADERS_ENV) \
-		$(GLIBC_DIR)/configure $(GLIBC_HEADERS_CONF_OPT)
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
+GLIBC_HEADERS_MAKE_OPT	:= sysdeps/gnu/errlist.c
+
 $(STATEDIR)/glibc-headers.compile:
 	@$(call targetinfo)
-	cd $(GLIBC_HEADERS_DIR) && \
-		$(GLIBC_HEADERS_PATH) $(GLIBC_HEADERS_ENV) \
-		$(MAKE) sysdeps/gnu/errlist.c
-
-	mkdir -p $(GLIBC_HEADERS_DIR)/stdio-common
-	touch $(GLIBC_HEADERS_DIR)/stdio-common/errlist-compat.c
+	@$(call world/compile, GLIBC_HEADERS)
+	@mkdir -vp $(GLIBC_HEADERS_BUILDDIR)/stdio-common
+	touch $(GLIBC_HEADERS_BUILDDIR)/stdio-common/errlist-compat.c
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
+GLIBC_HEADERS_INSTALL_OPT := \
+	cross_compiling=yes \
+	install_root=$(SYSROOT) \
+	install-headers
+
 $(STATEDIR)/glibc-headers.install:
 	@$(call targetinfo)
-	cd $(GLIBC_HEADERS_DIR) && \
-		$(GLIBC_HEADERS_PATH) $(GLIBC_HEADERS_ENV) \
-		$(MAKE) cross_compiling=yes install_root=$(SYSROOT) install-headers
-
-	mkdir -p $(SYSROOT)/usr/include/gnu
+	@$(call world/install, GLIBC_HEADERS)
+	@mkdir -vp $(SYSROOT)/usr/include/gnu
 	touch $(SYSROOT)/usr/include/gnu/stubs.h
-
-	cp $(GLIBC_DIR)/include/features.h $(SYSROOT)/usr/include/features.h
-	cp $(GLIBC_HEADERS_DIR)/bits/stdio_lim.h $(SYSROOT)/usr/include/bits/stdio_lim.h
+	@cp -v $(GLIBC_HEADERS_DIR)/include/features.h $(SYSROOT)/usr/include/features.h
+	@cp -v $(GLIBC_HEADERS_BUILDDIR)/bits/stdio_lim.h $(SYSROOT)/usr/include/bits/stdio_lim.h
 	@$(call touch)
 
 # vim: syntax=make
diff --git a/rules/glibc-ports.in b/rules/glibc-ports.in
deleted file mode 100644
index 639b249..0000000
--- a/rules/glibc-ports.in
+++ /dev/null
@@ -1,24 +0,0 @@
-menuconfig GLIBC_PORTS
-	prompt "glibc-ports                 "
-	bool
-
-if GLIBC_PORTS
-
-config GLIBC_PORTS_VERSION
-	string
-	default "${PTXCONF_GLIBC_VERSION}"
-
-config GLIBC_PORTS_MD5
-	string
-	prompt "glibc-ports source md5sum"
-
-config GLIBC_PORTS_TIMESTAMP
-	string
-	default "${PTXCONF_GLIBC_TIMESTAMP}"
-
-config GLIBC_PORTS_SERIES
-	string
-	prompt "glibc-ports patch series file"
-	default "series"
-
-endif
diff --git a/rules/glibc.make b/rules/glibc.make
index 38a8263..7151a2a 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -30,21 +30,6 @@ GLIBC_URL	:= \
 	ftp://sourceware.org/pub/glibc/snapshots/$(GLIBC).$(GLIBC_SUFFIX) \
 	http://www.pengutronix.de/software/ptxdist/temporary-src/glibc/$(GLIBC).$(GLIBC_SUFFIX)
 
-GLIBC_PORTS_VERSION	:= $(call remove_quotes,$(PTXCONF_GLIBC_PORTS_VERSION))
-GLIBC_PORTS_MD5		:= $(call remove_quotes,$(PTXCONF_GLIBC_PORTS_MD5))
-GLIBC_PORTS		:= glibc-ports-$(GLIBC_PORTS_VERSION)
-GLIBC_PORTS_SOURCE	:= $(SRCDIR)/$(GLIBC_PORTS).$(GLIBC_SUFFIX)
-$(GLIBC_PORTS_SOURCE)	:= GLIBC_PORTS
-GLIBC_PORTS_DIR		:= $(BUILDDIR)/$(GLIBC)/ports
-GLIBC_PORTS_URL		:= \
-	$(call ptx/mirror, GNU, glibc/$(GLIBC_PORTS).$(GLIBC_SUFFIX)) \
-	ftp://sources.redhat.com/pub/glibc/snapshots/$(GLIBC_PORTS).$(GLIBC_SUFFIX) \
-	http://www.pengutronix.de/software/ptxdist/temporary-src/glibc/$(GLIBC_PORTS).$(GLIBC_SUFFIX)
-
-ifdef PTXCONF_GLIBC_PORTS
-GLIBC_SOURCES		+= $(GLIBC_PORTS_SOURCE)
-endif
-
 # ----------------------------------------------------------------------------
 # Extract
 # ----------------------------------------------------------------------------
@@ -53,9 +38,6 @@ $(STATEDIR)/glibc.extract:
 	@$(call targetinfo)
 	@$(call clean, $(GLIBC_DIR))
 	@$(call extract, GLIBC, $(BUILDDIR_DEBUG))
-ifdef PTXCONF_GLIBC_PORTS
-	@$(call extract, GLIBC_PORTS, $(BUILDDIR_DEBUG))
-endif
 	@$(call patchin, GLIBC, $(GLIBC_DIR))
 	@$(call touch)
 
@@ -80,9 +62,6 @@ GLIBC_MAKEVARS := AUTOCONF=no
 # autoconf
 #
 GLIBC_ADDONS	:= libidn
-ifdef PTXCONF_GLIBC_PORTS
-GLIBC_ADDONS	+= ports
-endif
 GLIBC_ADDONS	+=  $(call remove_quotes, $(PTXCONF_GLIBC_EXTRA_ADDONS))
 
 GLIBC_AUTOCONF_COMMON := \
@@ -93,6 +72,9 @@ GLIBC_AUTOCONF_COMMON := \
 	--with-headers=$(SYSROOT)/usr/include \
 	--enable-add-ons=$(subst $(space),$(comma),$(GLIBC_ADDONS)) \
 	\
+	--disable-build-nscd \
+	--disable-nscd \
+	\
 	--without-cvs \
 	--without-gd \
 	--without-selinux \
@@ -115,6 +97,7 @@ GLIBC_CONF_OPT	:= \
 	--enable-debug \
 	--enable-profile \
 	--enable-shared \
+	--enable-stackguard-randomization \
 	--enable-static-nss
 
 # ----------------------------------------------------------------------------