glibc: cleanup rules

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

8 files changed, 45 insertions, 431 deletions

diff --git a/rules/glibc-crt.make b/rules/glibc-crt.make
index 95375b5..ad6170a 100644
--- a/rules/glibc-crt.make
+++ b/rules/glibc-crt.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2006 by Robert Schwebel <r.schwebel@pengutronix.de>
+#               2013 by Michael Olbrich <m.olbrich@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -19,22 +20,6 @@ PACKAGES-$(PTXCONF_GLIBC_CRT) += glibc-crt
 GLIBC_CRT_DIR	= $(BUILDDIR)/$(GLIBC)-crt-build
 
 # ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-crt.get: $(STATEDIR)/glibc.get
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-crt.extract: $(STATEDIR)/glibc.extract
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
@@ -51,25 +36,17 @@ GLIBC_CRT_ENV := \
 #
 # autoconf
 #
-GLIBC_CRT_AUTOCONF = $(GLIBC_AUTOCONF)
+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-crt.prepare: $(STATEDIR)/glibc.extract
 	@$(call targetinfo)
 	@$(call clean, $(GLIBC_CRT_DIR))
 	mkdir -p $(GLIBC_CRT_DIR)
 	cd $(GLIBC_CRT_DIR) && eval \
 		$(GLIBC_CRT_PATH) $(GLIBC_CRT_ENV) \
-		$(GLIBC_DIR)/configure $(GLIBC_CRT_AUTOCONF)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-crt.compile:
-	@$(call targetinfo)
-	cd $(GLIBC_CRT_DIR) && $(GLIBC_CRT_PATH) \
-		$(MAKE) $(PARALLELMFLAGS) csu/subdir_lib
+		$(GLIBC_DIR)/configure $(GLIBC_CRT_CONF_OPT)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -85,20 +62,4 @@ $(STATEDIR)/glibc-crt.install:
 	done
 	@$(call touch)
 
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-crt.targetinstall:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-glibc-crt_clean:
-	rm -rf $(STATEDIR)/glibc-crt.*
-	rm -rf $(GLIBC_CRT_DIR)
-
 # vim: syntax=make
diff --git a/rules/glibc-first.make b/rules/glibc-first.make
index 1a6523a..1d994e0 100644
--- a/rules/glibc-first.make
+++ b/rules/glibc-first.make
@@ -1,8 +1,8 @@
 # -*-makefile-*-
-# $Id: template 6655 2007-01-02 12:55:21Z rsc $
 #
 # Copyright (C) 2006 by Robert Schwebel
 #		2007, 2008 by Marc Kleine-Budde
+#               2013 by Michael Olbrich <m.olbrich@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -21,22 +21,6 @@ PACKAGES-$(PTXCONF_GLIBC_FIRST) += glibc-first
 GLIBC_FIRST_BUILDDIR	= $(BUILDDIR)/$(GLIBC)-first-build
 
 # ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-first.get: $(STATEDIR)/glibc.get
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-first.extract: $(STATEDIR)/glibc.extract
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
@@ -57,57 +41,30 @@ GLIBC_FIRST_ENV := \
 	\
 	ac_cv_sizeof_long_double=$(PTXCONF_SIZEOF_LONG_DOUBLE)
 
-GLIBC_FIRST_MAKEVARS := AUTOCONF=no
-
-GLIBC_FIRST_AUTOCONF = \
+GLIBC_FIRST_CONF_TOOL	:= autoconf
+GLIBC_FIRST_CONF_OPT	 = \
 	$(GLIBC_AUTOCONF_COMMON) \
 	$(PTXCONF_GLIBC_CONFIG_EXTRA_CROSS) \
 	--disable-debug \
 	--disable-profile \
 
-$(STATEDIR)/glibc-first.prepare:
+$(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_AUTOCONF)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-first.compile:
-	@$(call targetinfo)
-	cd $(GLIBC_FIRST_BUILDDIR) && $(GLIBC_FIRST_PATH) $(MAKE) $(PARALLELMFLAGS) lib
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-first.install:
-	@$(call targetinfo)
-	cd $(GLIBC_FIRST_BUILDDIR) && \
-		$(GLIBC_FIRST_PATH) $(MAKE) $(GLIBC_FIRST_MAKEVARS) \
-		install_root=$(SYSROOT) install-lib-all install-headers
+		$(GLIBC_DIR)/configure $(GLIBC_FIRST_CONF_OPT)
 	@$(call touch)
 
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-first.targetinstall:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
+GLIBC_FIRST_MAKE_OPT	:= \
+	AUTOCONF=no \
+	lib
 
-glibc-first_clean:
-	rm -rf $(STATEDIR)/glibc-first.*
-	rm -rf $(GLIBC_FIRST_BUILDDIR)
+GLIBC_FIRST_INSTALL_OPT	:= \
+	AUTOCONF=no \
+	install_root=$(SYSROOT) \
+	install-lib-all \
+	install-headers
 
 # vim: syntax=make
diff --git a/rules/glibc-headers.make b/rules/glibc-headers.make
index f5c00a0..3ac4e51 100644
--- a/rules/glibc-headers.make
+++ b/rules/glibc-headers.make
@@ -2,6 +2,7 @@
 #
 # Copyright (C) 2006 by Robert Schwebel
 #               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+#               2013 by Michael Olbrich <m.olbrich@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -20,22 +21,6 @@ PACKAGES-$(PTXCONF_GLIBC_HEADERS) += glibc-headers
 GLIBC_HEADERS_DIR	= $(BUILDDIR)/$(GLIBC)-headers-build
 
 # ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-headers.get: $(STATEDIR)/glibc.get
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-headers.extract: $(STATEDIR)/glibc.extract
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
@@ -94,18 +79,19 @@ GLIBC_HEADERS_ENV  := \
 #
 # autoconf
 #
-GLIBC_HEADERS_AUTOCONF = \
+GLIBC_HEADERS_CONF_TOOL	:= autoconf
+GLIBC_HEADERS_CONF_OPT	 = \
 	$(GLIBC_AUTOCONF_COMMON) \
 	\
 	--enable-hacker-mode
 
-$(STATEDIR)/glibc-headers.prepare:
+$(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_AUTOCONF)
+		$(GLIBC_DIR)/configure $(GLIBC_HEADERS_CONF_OPT)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -139,20 +125,4 @@ $(STATEDIR)/glibc-headers.install:
 	cp $(GLIBC_HEADERS_DIR)/bits/stdio_lim.h $(SYSROOT)/usr/include/bits/stdio_lim.h
 	@$(call touch)
 
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-headers.targetinstall:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-glibc-headers_clean:
-	rm -rf $(STATEDIR)/glibc-headers.*
-	rm -rf $(GLIBC_HEADERS_DIR)
-
 # vim: syntax=make
diff --git a/rules/glibc-linuxthreads.in b/rules/glibc-linuxthreads.in
deleted file mode 100644
index 164da76..0000000
--- a/rules/glibc-linuxthreads.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config GLIBC_LINUXTHREADS
-	bool
-
-if GLIBC_LINUXTHREADS
-
-config GLIBC_LINUXTHREADS_VERSION
-	string
-	default "${PTXCONF_GLIBC_VERSION}"
-
-config GLIBC_LINUXTHREADS_MD5
-	string
-	prompt "glibc-linuxthreads source md5sum"
-
-endif
diff --git a/rules/glibc-linuxthreads.make b/rules/glibc-linuxthreads.make
deleted file mode 100644
index a492bb8..0000000
--- a/rules/glibc-linuxthreads.make
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*-makefile-*-
-# $Id: template 6001 2006-08-12 10:15:00Z mkl $
-#
-# Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_GLIBC_LINUXTHREADS) += glibc-linuxthreads
-
-#
-# Paths and names
-#
-GLIBC_LINUXTHREADS_VERSION	:= $(call remove_quotes,$(PTXCONF_GLIBC_LINUXTHREADS_VERSION))
-GLIBC_LINUXTHREADS_MD5		:= $(call remove_quotes,$(PTXCONF_GLIBC_LINUXTHREADS_MD5))
-GLIBC_LINUXTHREADS		:= glibc-linuxthreads-$(GLIBC_LINUXTHREADS_VERSION)
-GLIBC_LINUXTHREADS_SUFFIX	:= tar.bz2
-GLIBC_LINUXTHREADS_URL		:= $(call ptx/mirror, GNU, glibc/$(GLIBC_LINUXTHREADS).$(GLIBC_LINUXTHREADS_SUFFIX))
-GLIBC_LINUXTHREADS_SOURCE	:= $(SRCDIR)/$(GLIBC_LINUXTHREADS).$(GLIBC_LINUXTHREADS_SUFFIX)
-GLIBC_LINUXTHREADS_DIR		:= $(BUILDDIR)/$(GLIBC_LINUXTHREADS)
-GLIBC_LINUXTHREADS_STRIP_LEVEL	:= 0
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(GLIBC_LINUXTHREADS_SOURCE):
-	@$(call targetinfo)
-	@$(call get, GLIBC_LINUXTHREADS)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-ifdef PTXCONF_GLIBC_LINUXTHREADS
-$(STATEDIR)/glibc.extract: $(STATEDIR)/glibc-linuxthreads.extract
-endif
-
-$(STATEDIR)/glibc-linuxthreads.extract:
-	@$(call targetinfo)
-	@$(call clean, $(GLIBC_LINUXTHREADS_DIR))
-	@$(call extract, GLIBC_LINUXTHREADS, $(GLIBC_LINUXTHREADS_DIR))
-	@$(call patchin, GLIBC_LINUXTHREADS, $(GLIBC_LINUXTHREADS_DIR))
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-linuxthreads.prepare:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-linuxthreads.compile:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-linuxthreads.install:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-linuxthreads.targetinstall:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-glibc-linuxthreads_clean:
-	rm -rf $(STATEDIR)/glibc-linuxthreads.*
-	rm -rf $(GLIBC_LINUXTHREADS_DIR)
-
-# vim: syntax=make
diff --git a/rules/glibc-ports.make b/rules/glibc-ports.make
deleted file mode 100644
index e7c1bbd..0000000
--- a/rules/glibc-ports.make
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*-makefile-*-
-#
-# 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.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_GLIBC_PORTS) += glibc-ports
-
-#
-# Paths and names
-#
-ifneq ($(PTXCONF_GLIBC_VERSION),"")
-GLIBC_PORTS_VERSION	:= -$(call remove_quotes,$(PTXCONF_GLIBC_PORTS_VERSION))
-GLIBC_PORTS_MD5		:= $(call remove_quotes,$(PTXCONF_GLIBC_PORTS_MD5))
-endif
-
-ifneq ($(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_VERSION)
-endif
-
-GLIBC_PORTS_SUFFIX	:= tar.bz2
-GLIBC_PORTS_SOURCE	:= $(SRCDIR)/$(GLIBC_PORTS).$(GLIBC_PORTS_SUFFIX)
-GLIBC_PORTS_DIR		:= $(BUILDDIR)/$(GLIBC_PORTS)
-
-GLIBC_PORTS_URL		:= \
-	$(call ptx/mirror, GNU, 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
-# ----------------------------------------------------------------------------
-
-$(GLIBC_PORTS_SOURCE):
-	@$(call targetinfo)
-	@$(call get, GLIBC_PORTS)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-ifdef PTXCONF_GLIBC_PORTS
-$(STATEDIR)/glibc.extract: $(STATEDIR)/glibc-ports.extract
-endif
-
-$(STATEDIR)/glibc-ports.extract:
-	@$(call targetinfo)
-	@$(call clean, $(GLIBC_PORTS_DIR))
-	@$(call extract, GLIBC_PORTS, $(BUILDDIR))
-	@$(call patchin, GLIBC_PORTS, $(GLIBC_PORTS_DIR))
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-ports.prepare:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-ports.compile:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-ports.install:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc-ports.targetinstall:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-glibc-ports_clean:
-	rm -rf $(STATEDIR)/glibc-ports.*
-	rm -rf $(GLIBC_PORTS_DIR)
-
-# vim: syntax=make
diff --git a/rules/glibc.in b/rules/glibc.in
index fe876ac..fe47d79 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -17,8 +17,6 @@ menuconfig GLIBC
 	bool
 
 	select GLIBC_CRT
-	select GLIBC_PORTS		if GLIBC_ADDON_NPTL && ( ARCH_ARM || ARCH_MIPS )
-	select GLIBC_LINUXTHREADS	if GLIBC_ADDON_LINUXTHREADS
 
 	select TOOLCHAIN_ENABLE_SYSROOT
 	select TOOLCHAIN_DISABLE_MULTILIB
@@ -88,24 +86,6 @@ config GLIBC_HEADERS_FAKE_CROSS
 	help
 	  Add these args to fake a crosscompiler during glibc-header extraction stage.
 
-choice
-	prompt "Thread implementation"
-	default GLIBC_ADDON_NPTL
-
-	config GLIBC_ADDON_LINUXTHREADS
-		bool
-		prompt "linuxthreads"
-		help
-		  Activate the linuxthreads addon.
-
-	config GLIBC_ADDON_NPTL
-		bool
-		prompt "nptl"
-		select GLIBC_TLS
-		help
-		  Activate the NPTL addon.
-endchoice
-
 config GLIBC_TLS
 	bool
 	prompt "enable TLS"
diff --git a/rules/glibc.make b/rules/glibc.make
index 74f26d2..76042c6 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -1,8 +1,8 @@
 # -*-makefile-*-
-# $Id: template 6655 2007-01-02 12:55:21Z rsc $
 #
 # Copyright (C) 2006 by Robert Schwebel
 #		2007, 2008 by Marc Kleine-Budde
+#               2013 by Michael Olbrich <m.olbrich@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -18,32 +18,32 @@ PACKAGES-$(PTXCONF_GLIBC) += glibc
 #
 # Paths and names
 #
-ifneq ($(PTXCONF_GLIBC_VERSION),"")
-GLIBC_VERSION	:= -$(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
+GLIBC_VERSION	:= $(call remove_quotes,$(PTXCONF_GLIBC_VERSION))
 GLIBC_MD5	:= $(call remove_quotes,$(PTXCONF_GLIBC_MD5))
-endif
-ifneq ($(PTXCONF_GLIBC_TIMESTAMP),"")
-GLIBC_TIMESTAMP	:= -$(call remove_quotes,$(PTXCONF_GLIBC_TIMESTAMP))
-endif
-
-GLIBC		:= glibc$(GLIBC_VERSION)$(GLIBC_TIMESTAMP)
+GLIBC		:= glibc-$(GLIBC_VERSION)
 GLIBC_SUFFIX	:= tar.bz2
 GLIBC_SOURCE	:= $(SRCDIR)/$(GLIBC).$(GLIBC_SUFFIX)
 GLIBC_DIR	:= $(BUILDDIR_DEBUG)/$(GLIBC)
 GLIBC_BUILDDIR	:= $(BUILDDIR)/$(GLIBC)-build
-
 GLIBC_URL	:= \
 	$(call ptx/mirror, GNU, glibc/$(GLIBC).$(GLIBC_SUFFIX)) \
 	ftp://sourceware.org/pub/glibc/snapshots/$(GLIBC).$(GLIBC_SUFFIX) \
 	http://www.pengutronix.de/software/ptxdist/temporary-src/glibc/$(GLIBC).$(GLIBC_SUFFIX)
 
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
+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)
 
-$(GLIBC_SOURCE):
-	@$(call targetinfo)
-	@$(call get, GLIBC)
+ifdef PTXCONF_GLIBC_PORTS
+GLIBC_SOURCES		+= $(GLIBC_PORTS_SOURCE)
+endif
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -53,16 +53,10 @@ $(STATEDIR)/glibc.extract:
 	@$(call targetinfo)
 	@$(call clean, $(GLIBC_DIR))
 	@$(call extract, GLIBC, $(BUILDDIR_DEBUG))
-	@$(call patchin, GLIBC, $(GLIBC_DIR))
-
-ifdef PTXCONF_GLIBC_LINUXTHREADS
-	cp -r $(GLIBC_LINUXTHREADS_DIR)/linuxthreads $(GLIBC_DIR)
-	cp -r $(GLIBC_LINUXTHREADS_DIR)/linuxthreads_db $(GLIBC_DIR)
-endif
 ifdef PTXCONF_GLIBC_PORTS
-	mkdir -p $(GLIBC_DIR)/ports
-	cp -r $(GLIBC_PORTS_DIR)/* $(GLIBC_DIR)/ports
+	@$(call extract, GLIBC_PORTS, $(BUILDDIR_DEBUG))
 endif
+	@$(call patchin, GLIBC, $(GLIBC_DIR))
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -88,13 +82,8 @@ GLIBC_MAKEVARS := AUTOCONF=no
 ifdef PTXCONF_GLIBC_PORTS
 GLIBC_ADDONS	+= ports
 endif
-ifdef PTXCONF_GLIBC_ADDON_NPTL
 GLIBC_ADDONS	+= nptl
-endif
-ifdef PTXCONF_GLIBC_ADDON_LINUXTHREADS
-GLIBC_ADDONS	+= linuxthreads
-endif
-GLIBC_ADDONS	+= $(call remove_quotes, $(PTXCONF_GLIBC_EXTRA_ADDONS))
+GLIBC_ADDONS	+=  $(call remove_quotes, $(PTXCONF_GLIBC_EXTRA_ADDONS))
 
 GLIBC_AUTOCONF_COMMON := \
 	--prefix=/usr \
@@ -117,7 +106,8 @@ else
 GLIBC_AUTOCONF_COMMON	+= --without-tls --without-__thread
 endif
 
-GLIBC_AUTOCONF := \
+GLIBC_CONF_TOOL	:= autoconf
+GLIBC_CONF_OPT	:= \
 	$(GLIBC_AUTOCONF_COMMON) \
 	$(PTXCONF_GLIBC_CONFIG_EXTRA_CROSS) \
 	\
@@ -127,24 +117,6 @@ GLIBC_AUTOCONF := \
 	--enable-shared \
 	--enable-static-nss
 
-$(STATEDIR)/glibc.prepare:
-	@$(call targetinfo)
-	@$(call clean, $(GLIBC_BUILDDIR))
-	mkdir -p $(GLIBC_BUILDDIR)
-	cd $(GLIBC_BUILDDIR) && \
-		$(GLIBC_ENV) $(GLIBC_PATH) \
-		$(GLIBC_DIR)/configure $(GLIBC_AUTOCONF)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc.compile:
-	@$(call targetinfo)
-	cd $(GLIBC_BUILDDIR) && $(GLIBC_PATH) $(MAKE) $(PARALLELMFLAGS)
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
@@ -168,20 +140,4 @@ $(STATEDIR)/glibc.install:
 
 	@$(call touch)
 
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/glibc.targetinstall:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-glibc_clean:
-	rm -rf $(STATEDIR)/glibc.*
-	rm -rf $(GLIBC_DIR)
-
 # vim: syntax=make