glibc: install to pkgdir

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

3 files changed, 18 insertions, 20 deletions

diff --git a/rules/glibc-first.make b/rules/glibc-first.make
index b093a50..92f014f 100644
--- a/rules/glibc-first.make
+++ b/rules/glibc-first.make
@@ -24,6 +24,7 @@ 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_PKGDIR	:= $(PKGDIR)/glibc-first-$(GLIBC_FIRST_VERSION)
 GLIBC_FIRST_BUILDDIR	:= $(GLIBC_FIRST_DIR)-build
 GLIBC_FIRST_URL		 = $(GLIBC_URL)
 GLIBC_FIRST_BUILD_OOT	:= YES
@@ -63,7 +64,6 @@ GLIBC_FIRST_MAKE_OPT	:= \
 
 GLIBC_FIRST_INSTALL_OPT	:= \
 	AUTOCONF=no \
-	install_root=$(SYSROOT) \
 	install-lib-all \
 	install-headers
 
diff --git a/rules/glibc-headers.make b/rules/glibc-headers.make
index adb7d2f..17a2655 100644
--- a/rules/glibc-headers.make
+++ b/rules/glibc-headers.make
@@ -24,6 +24,7 @@ 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_PKGDIR	:= $(PKGDIR)/glibc-headers-$(GLIBC_HEADERS_VERSION)
 GLIBC_HEADERS_BUILDDIR	:= $(GLIBC_HEADERS_DIR)-build
 GLIBC_HEADERS_URL	 = $(GLIBC_URL)
 GLIBC_HEADERS_BUILD_OOT	:= YES
@@ -46,8 +47,8 @@ GLIBC_HEADERS_ENV  := \
 	\
 	libc_cv_prog_as_gnu=yes \
 	libc_cv_prog_ld_gnu=yes \
-	ac_cv_prog_AS="$(PTXCONF_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)as" \
-	ac_cv_prog_LD="$(PTXCONF_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)ld.bfd" \
+	ac_cv_prog_AS="$(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/bin/$(COMPILER_PREFIX)as" \
+	ac_cv_prog_LD="$(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/bin/$(COMPILER_PREFIX)ld.bfd" \
 	\
 	libc_cv_asm_cfi_directive_sections=yes \
 	libc_cv_asm_cfi_directives=yes \
@@ -119,18 +120,19 @@ $(STATEDIR)/glibc-headers.compile:
 # Install
 # ----------------------------------------------------------------------------
 
-GLIBC_HEADERS_INSTALL_OPT := \
+GLIBC_HEADERS_INSTALL_OPT	:= \
 	cross_compiling=yes \
-	install_root=$(SYSROOT) \
 	install-headers
 
 $(STATEDIR)/glibc-headers.install:
 	@$(call targetinfo)
 	@$(call world/install, GLIBC_HEADERS)
-	@mkdir -vp $(SYSROOT)/usr/include/gnu
-	touch $(SYSROOT)/usr/include/gnu/stubs.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
+	@install -vd -m 755 $(GLIBC_HEADERS_PKGDIR)/usr/include/gnu
+	touch $(GLIBC_HEADERS_PKGDIR)/usr/include/gnu/stubs.h
+	@install -vD -m 644 $(GLIBC_HEADERS_DIR)/include/features.h \
+		$(GLIBC_HEADERS_PKGDIR)/usr/include/features.h
+	@install -vD -m 644  $(GLIBC_HEADERS_BUILDDIR)/bits/stdio_lim.h \
+		$(GLIBC_HEADERS_PKGDIR)/usr/include/bits/stdio_lim.h
 	@$(call touch)
 
 # vim: syntax=make
diff --git a/rules/glibc.make b/rules/glibc.make
index 2cc78f2..6611a48 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -49,8 +49,6 @@ GLIBC_ENV := \
 	ac_cv_sizeof_long_double=$(PTXCONF_SIZEOF_LONG_DOUBLE)
 
 
-GLIBC_MAKEVARS := AUTOCONF=no
-
 #
 # autoconf
 #
@@ -86,21 +84,19 @@ GLIBC_CONF_OPT	:= \
 
 $(STATEDIR)/glibc.install: $(STATEDIR)/glibc.report
 	@$(call targetinfo)
-	cd $(GLIBC_BUILDDIR) && \
-		$(GLIBC_PATH) $(MAKE) $(GLIBC_MAKEVARS) \
-		install_root=$(SYSROOT) install
+	@$(call world/install, GLIBC)
 
 	@$(call world/env, GLIBC) ptxd_make_world_copy_license
 #
 # Fix a bug when linking statically
 # see: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=76451
 #
-	if [ -e "$(SYSROOT)/usr/lib/libnss_files.a" ]; then \
-		mv -- "$(SYSROOT)/usr/lib/libc.a" "$(SYSROOT)/usr/lib/libc_ns.a" && \
-		echo '/* GNU ld script'											>  "$(SYSROOT)/usr/lib/libc.a" && \
-		echo '   Use the static library, but some functions are in other strange'				>> "$(SYSROOT)/usr/lib/libc.a" && \
-		echo '   libraries :-( So try them secondarily. */'							>> "$(SYSROOT)/usr/lib/libc.a" && \
-		echo 'GROUP ( /usr/lib/libc_ns.a /usr/lib/libnss_files.a /usr/lib/libnss_dns.a /usr/lib/libresolv.a )'	>> "$(SYSROOT)/usr/lib/libc.a" ; \
+	if [ -e "$(GLIBC_PKGDIR)/usr/lib/libnss_files.a" ]; then \
+		mv -- "$(GLIBC_PKGDIR)/usr/lib/libc.a" "$(GLIBC_PKGDIR)/usr/lib/libc_ns.a" && \
+		echo '/* GNU ld script'											>  "$(GLIBC_PKGDIR)/usr/lib/libc.a" && \
+		echo '   Use the static library, but some functions are in other strange'				>> "$(GLIBC_PKGDIR)/usr/lib/libc.a" && \
+		echo '   libraries :-( So try them secondarily. */'							>> "$(GLIBC_PKGDIR)/usr/lib/libc.a" && \
+		echo 'GROUP ( /usr/lib/libc_ns.a /usr/lib/libnss_files.a /usr/lib/libnss_dns.a /usr/lib/libresolv.a )'	>> "$(GLIBC_PKGDIR)/usr/lib/libc.a" ; \
 	fi
 
 	@$(call touch)