diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /core/glibc | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'core/glibc')
| -rw-r--r-- | core/glibc/PKGBUILD | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index f3a040236..0008d80ac 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 128661 2011-06-25 11:56:19Z allan $ +# $Id: PKGBUILD 135924 2011-08-20 07:14:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,15 +6,15 @@ pkgname=glibc pkgver=2.14 -pkgrel=4 +pkgrel=5 _glibcdate=20110617 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=2.6.39' 'tzdata') -makedepends=('gcc>=4.4') +depends=('linux-api-headers>=3.0' 'tzdata') +makedepends=('gcc>=4.6') backup=(etc/locale.gen etc/nscd.conf) options=('!strip') @@ -112,6 +112,10 @@ build() { echo "slibdir=/lib" >> configparms + # 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/lib --libexecdir=/usr/lib \ --with-headers=/usr/include \ @@ -121,8 +125,19 @@ build() { --enable-bind-now --without-gd \ --without-cvs --disable-profile \ --disable-multi-arch - + + # 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() { |