1 files changed, 67 insertions, 0 deletions
diff --git a/src/stage4/patches/glibc.patch b/src/stage4/patches/glibc.patch
new file mode 100644
index 0000000..0ed324d
--- /dev/null
+++ b/src/stage4/patches/glibc.patch
@@ -0,0 +1,67 @@
+--- a/PKGBUILD	2018-03-21 10:05:48.270438408 +0100
++++ b/PKGBUILD	2018-03-21 10:08:59.870913388 +0100
+@@ -6,21 +6,23 @@
+ # NOTE: valgrind requires rebuilt with each major glibc version
+ 
+ pkgbase=glibc
+-pkgname=(glibc lib32-glibc)
+-pkgver=2.26
+-pkgrel=11
++pkgname=(glibc)
++[ "x@MULTILIB@" != "xenable" ] || pkgname+=(lib32-glibc)
++pkgver=2.27
++pkgrel=1
+ arch=(x86_64)
+ url='http://www.gnu.org/software/libc'
+ license=(GPL LGPL)
+-makedepends=(git gd lib32-gcc-libs)
++makedepends=(gd)
++[ "x@MULTILIB@" != "xenable" ] || makedepends+=(lib32-gcc-libs)
+ options=(!strip staticlibs)
+ _commit=de51f431ed6226ec68ca76e578f2cbd55b6262cb
+-source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
++source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.gz
+         locale.gen.txt
+         locale-gen
+         lib32-glibc.conf
+         bz20338.patch)
+-md5sums=('SKIP'
++md5sums=('527bc6270e37ab97314a3af0b7b83db8'
+          '07ac979b6ab5eeb778d55f041529d623'
+          '476e9113489f93b348b21e144b6a8fcf'
+          '6e052f1cb693d5d3203f50f9d4e8c33b'
+@@ -29,6 +31,7 @@ md5sums=('SKIP'
+ prepare() {
+   mkdir -p glibc-build lib32-glibc-build
+ 
++  ln -s glibc-$pkgver glibc
+   cd glibc
+ 
+   local i; for i in ${source[@]}; do
+@@ -49,7 +52,7 @@ build() {
+       --enable-add-ons
+       --enable-bind-now
+       --enable-lock-elision
+-      --enable-multi-arch
++      --@MULTILIB@-multi-arch
+       --enable-obsolete-nsl
+       --enable-obsolete-rpc
+       --enable-stack-protector=strong
+@@ -84,6 +87,8 @@ build() {
+   echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms
+   make
+ 
++  [ "x@MULTILIB@" == "xenable" ] || return 0
++
+   cd "$srcdir/lib32-glibc-build"
+   export CC="gcc -m32 -mstackrealign"
+   export CXX="g++ -m32 -mstackrealign"
+@@ -177,7 +182,7 @@ package_glibc() {
+     strip $STRIP_STATIC usr/lib/lib{anl,BrokenLocale,c{,_nonshared},crypt}.a \
+                         usr/lib/lib{dl,g,ieee,mcheck,nsl,pthread{,_nonshared}}.a \
+                         usr/lib/lib{resolv,rpcsvc,rt,util}.a \
+-                        usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a
++                        usr/lib/lib{m-${pkgver},mvec{,_nonshared}}.a || true
+ 
+     strip $STRIP_SHARED usr/lib/lib{anl,BrokenLocale,cidn,crypt}-${pkgver}.so \
+                         usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \