Date: Wednesday, March 8, 2017 @ 15:17:54 Author: heftig Revision: 215304
Rest of 2.25-1 Modified: lib32-glibc/trunk/PKGBUILD ----------+ PKGBUILD | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-08 14:56:15 UTC (rev 215303) +++ PKGBUILD 2017-03-08 15:17:54 UTC (rev 215304) @@ -15,7 +15,7 @@ url="http://www.gnu.org/software/libc"; license=('GPL' 'LGPL') groups=() -depends=() +depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=6' 'git') backup=() @@ -30,7 +30,7 @@ prepare() { mkdir glibc-build - + cd glibc # avoid crashes on i686 memchr-sse2.S # https://sourceware.org/bugzilla/show_bug.cgi?id=21182 @@ -76,23 +76,24 @@ --disable-werror \ i686-pc-linux-gnu - # build libraries with hardening disabled + # build libraries with fortify disabled echo "build-programs=no" >> configparms make - # re-enable hardening for programs + # re-enable fortify for programs sed -i "/build-programs=/s#no#yes#" configparms + echo "CC += -D_FORTIFY_SOURCE=2" >> configparms echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms make - - # remove harding in preparation to run test-suite - sed -i '/FORTIFY/d' configparms } check() { cd glibc-build + # remove fortify in preparation to run test-suite + sed -i '/FORTIFY/d' configparms + # some failures are "expected" make check || true } @@ -117,11 +118,6 @@ # Symlink /usr/lib32/locale to /usr/lib/locale ln -s ../lib/locale "$pkgdir/usr/lib32/locale" - # remove the static libraries that have a shared counterpart - # libc, libdl, libm and libpthread are required for toolchain testsuites - # in addition libcrypt appears widely required - rm $pkgdir/usr/lib32/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a - # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so @@ -138,14 +134,22 @@ - strip $STRIP_STATIC usr/lib32/*.a + strip $STRIP_STATIC usr/lib32/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \ + usr/lib32/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \ + usr/lib32/lib{resolv,rpcsvc,rt,util}.a - strip $STRIP_SHARED usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-*.so \ + strip $STRIP_SHARED usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \ usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ - usr/lib32/lib{dl,m,nsl,resolv,rt,util}-*.so \ + usr/lib32/lib{dl,m,nsl,resolv,rt,util}-${pkgver}.so \ usr/lib32/lib{memusage,pcprofile,SegFault}.so \ usr/lib32/{audit,gconv}/*.so || true + + + + #if [[ $CARCH = "i686" ]]; then + strip $STRIP_STATIC usr/lib32/libm.a + #fi }
