diff options
Diffstat (limited to 'src/stage3/patches/generic/glibc.patch')
-rw-r--r-- | src/stage3/patches/generic/glibc.patch | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/src/stage3/patches/generic/glibc.patch b/src/stage3/patches/generic/glibc.patch index ca64f4c..4531ac5 100644 --- a/src/stage3/patches/generic/glibc.patch +++ b/src/stage3/patches/generic/glibc.patch @@ -1,7 +1,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-06-10 02:55:37.495747371 +0200 -+++ b/PKGBUILD 2018-06-10 08:10:22.642602471 +0200 -@@ -6,13 +6,15 @@ +--- a/PKGBUILD 2018-06-18 09:36:19.679550645 +0200 ++++ b/PKGBUILD 2018-06-19 15:05:54.550610043 +0200 +@@ -6,13 +6,14 @@ # NOTE: valgrind requires rebuilt with each major glibc version pkgbase=glibc @@ -14,12 +14,11 @@ diff -rupN a/PKGBUILD b/PKGBUILD url='http://www.gnu.org/software/libc' license=(GPL LGPL) -makedepends=(git gd lib32-gcc-libs) -+makedepends=(git gd) +[ "x@MULTILIB@" != "xenable" ] || makedepends+=(lib32-gcc-libs) options=(!strip staticlibs) _commit=23158b08a0908f381459f273a984c6fd328363cb #source=(git+https://sourceware.org/git/glibc.git#commit=$_commit -@@ -53,10 +55,10 @@ build() { +@@ -53,10 +54,10 @@ build() { --enable-add-ons --enable-bind-now --enable-lock-elision @@ -32,7 +31,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD --disable-profile --disable-werror ) -@@ -70,6 +70,8 @@ build() { +@@ -70,6 +71,8 @@ build() { # remove fortify for building libraries CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} @@ -41,12 +40,34 @@ diff -rupN a/PKGBUILD b/PKGBUILD "$srcdir/glibc/configure" \ --libdir=/usr/lib \ -@@ -87,6 +89,8 @@ build() { +@@ -87,9 +90,11 @@ 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" +- export CC="gcc -m32 -mstackrealign" +- export CXX="g++ -m32 -mstackrealign" ++ export CC="gcc @PLATFORM32_CFLAGS@" ++ export CXX="g++ @PLATFORM32_CFLAGS@" + + echo "slibdir=/usr/lib32" >> configparms + echo "rtlddir=/usr/lib32" >> configparms +@@ -102,7 +107,7 @@ build() { + CXXFLAGS=${CXXFLAGS/-fno-plt/} + + "$srcdir/glibc/configure" \ +- --host=i686-pc-linux-gnu \ ++ --host=@CHOST32@ \ + --libdir=/usr/lib32 \ + --libexecdir=/usr/lib32 \ + ${_configure_flags[@]} +@@ -117,7 +122,6 @@ build() { + echo "CC += -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -D_FORTIFY_SOURCE=2" >> configparms + make +- + } + + check() { |