diff options
Diffstat (limited to 'src/stage2/patches/generic/glibc.patch')
| -rw-r--r-- | src/stage2/patches/generic/glibc.patch | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/stage2/patches/generic/glibc.patch b/src/stage2/patches/generic/glibc.patch index 6be827b..6408bd9 100644 --- a/src/stage2/patches/generic/glibc.patch +++ b/src/stage2/patches/generic/glibc.patch @@ -1,6 +1,6 @@ diff -rupN a/PKGBUILD b/PKGBUILD ---- a/PKGBUILD 2018-05-19 20:29:56.917412596 +0200 -+++ b/PKGBUILD 2018-05-19 20:33:17.550747931 +0200 +--- a/PKGBUILD 2018-06-18 22:54:08.616694943 +0200 ++++ b/PKGBUILD 2018-06-18 22:55:09.746695552 +0200 @@ -6,7 +6,8 @@ # NOTE: valgrind requires rebuilt with each major glibc version @@ -27,15 +27,29 @@ diff -rupN a/PKGBUILD b/PKGBUILD --enable-stack-protector=strong --enable-stackguard-randomization --enable-static-pie -@@ -87,6 +89,8 @@ build() { +@@ -87,9 +89,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="@CHOST@-gcc @PLATFORM32_CFLAGS@" ++ export CXX="@CHOST@-g++ @PLATFORM32_CFLAGS@" + + echo "slibdir=/usr/lib32" >> configparms + echo "rtlddir=/usr/lib32" >> configparms +@@ -102,7 +106,7 @@ build() { + CXXFLAGS=${CXXFLAGS/-fno-plt/} + + "$srcdir/glibc/configure" \ +- --host=i686-pc-linux-gnu \ ++ --host=@CHOST32@ \ + --libdir=/usr/lib32 \ + --libexecdir=/usr/lib32 \ + ${_configure_flags[@]} @@ -164,8 +168,8 @@ package_glibc() { "$srcdir/glibc/localedata/SUPPORTED" >> "$pkgdir/etc/locale.gen" |