From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 May 2010 00:06:51 +0000 (+0200)
Subject: glibc: Update to 2.12.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ae9e320b6d1301b09d25dff7eedbce4aa516516;p=ipfire-3.x.git

glibc: Update to 2.12.
---

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 020d6421c..6e84fee17 100644
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = glibc
-PKG_VER        = 2.11.1
+PKG_VER        = 2.12
 PKG_REL        = 0
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
diff --git a/pkgs/core/glibc/patches/glibc-2.11.1-hardened-pie.patch b/pkgs/core/glibc/patches/glibc-2.12-hardened-pie.patch
similarity index 83%
rename from pkgs/core/glibc/patches/glibc-2.11.1-hardened-pie.patch
rename to pkgs/core/glibc/patches/glibc-2.12-hardened-pie.patch
index 581613316..689e71c72 100644
--- a/pkgs/core/glibc/patches/glibc-2.11.1-hardened-pie.patch
+++ b/pkgs/core/glibc/patches/glibc-2.12-hardened-pie.patch
@@ -26,11 +26,11 @@
  ifeq ($(elf),yes)
  +preinit = $(addprefix $(csu-objpfx),crti.o)
  +postinit = $(addprefix $(csu-objpfx),crtn.o)
--+prector = `$(CC) --print-file-name=crtbegin.o`
--+postctor = `$(CC) --print-file-name=crtend.o`
+-+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
+-+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
 -# Variants of the two previous definitions for linking PIE programs.
- +prectorS = `$(CC) --print-file-name=crtbeginS.o`
- +postctorS = `$(CC) --print-file-name=crtendS.o`
+ +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
+ +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
 ++prector = $(+prectorS)
 ++postctor = $(+postctorS)
  +interp = $(addprefix $(elf-objpfx),interp.os)