mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-27 23:44:04 +00:00
revert glibc to -4
This commit is contained in:
parent
8acc001ef5
commit
a1375401c3
1 changed files with 1 additions and 16 deletions
|
@ -15,7 +15,7 @@ noautobuild=1
|
||||||
|
|
||||||
pkgname=glibc
|
pkgname=glibc
|
||||||
pkgver=2.14
|
pkgver=2.14
|
||||||
pkgrel=5
|
pkgrel=4
|
||||||
_glibcdate=20110617
|
_glibcdate=20110617
|
||||||
pkgdesc="GNU C Library"
|
pkgdesc="GNU C Library"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
|
@ -130,10 +130,6 @@ build() {
|
||||||
|
|
||||||
echo "slibdir=/lib" >> configparms
|
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 \
|
${srcdir}/glibc/configure --prefix=/usr \
|
||||||
--libdir=/usr/lib --libexecdir=/usr/lib \
|
--libdir=/usr/lib --libexecdir=/usr/lib \
|
||||||
--with-headers=/usr/include \
|
--with-headers=/usr/include \
|
||||||
|
@ -144,18 +140,7 @@ build() {
|
||||||
--without-cvs --disable-profile \
|
--without-cvs --disable-profile \
|
||||||
--disable-multi-arch $CONFIGFLAG
|
--disable-multi-arch $CONFIGFLAG
|
||||||
|
|
||||||
# build libraries with hardening disabled
|
|
||||||
echo "build-programs=no" >> configparms
|
|
||||||
make $MAKEFLAG
|
make $MAKEFLAG
|
||||||
|
|
||||||
# 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() {
|
check() {
|
||||||
|
|
Loading…
Reference in a new issue