From e9a5c646563c984f362db1777f8c6bc7da63a4ab Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 21 Aug 2011 23:14:35 +0000
Subject: Sun Aug 21 23:14:34 UTC 2011

---
 multilib/lib32-glibc/PKGBUILD | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'multilib/lib32-glibc/PKGBUILD')

diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
index 276d465cd..c4b759ef9 100644
--- a/multilib/lib32-glibc/PKGBUILD
+++ b/multilib/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50168 2011-06-25 17:22:07Z heftig $
+# $Id: PKGBUILD 54541 2011-08-20 07:14:05Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,14 +9,14 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.14
-pkgrel=4
+pkgrel=5
 _glibcdate=20110617
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 depends=("glibc>=$pkgver")
-makedepends=('gcc-multilib>=4.4')
+makedepends=('gcc-multilib>=4.6')
 options=('!strip' '!emptydirs')
 source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
         glibc-2.10-dont-build-timezone.patch
@@ -88,12 +88,16 @@ build() {
   mkdir glibc-build
   cd glibc-build
 
+  export CC="gcc -m32"
+
   # Hack to fix NPTL issues with Xen, only required on 32bit platforms
   export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
 
   echo "slibdir=/usr/lib32" >> configparms
 
-  export CC="gcc -m32"
+  # remove hardening options from CFLAGS for building libraries
+  CFLAGS=${CFLAGS/-fstack-protector/}
+  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
 
   ${srcdir}/glibc/configure --prefix=/usr \
       --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
@@ -104,8 +108,19 @@ build() {
       --enable-bind-now --without-gd \
       --without-cvs --disable-profile \
       --disable-multi-arch i686-unknown-linux-gnu
-        
+
+  # build libraries with hardening disabled
+  echo "build-programs=no" >> configparms
+  make
+  
+  # re-enable hardening for programs
+  sed -i "s#=no#=yes#" configparms
+  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
   make
+
+  # remove harding in preparation to run test-suite
+  sed -i '2,4d' configparms
 }
 
 check() {
-- 
cgit v1.2.3-54-g00ecf