glibc: cleanup rules

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

1 files changed, 21 insertions, 65 deletions

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