summaryrefslogtreecommitdiff
path: root/src/stage3/patches/generic/glibc.patch
blob: 4531ac5471f33c06d97bb44e006e41a8324b541d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
diff -rupN a/PKGBUILD b/PKGBUILD
--- 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
-pkgname=(glibc lib32-glibc)
+pkgname=(glibc)
+[ "x@MULTILIB@" != "xenable" ] || pkgname+=(lib32-glibc)
 pkgver=2.27
 pkgrel=3
 arch=(x86_64)
 url='http://www.gnu.org/software/libc'
 license=(GPL LGPL)
-makedepends=(git gd lib32-gcc-libs)
+[ "x@MULTILIB@" != "xenable" ] || makedepends+=(lib32-gcc-libs)
 options=(!strip staticlibs)
 _commit=23158b08a0908f381459f273a984c6fd328363cb
 #source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
@@ -53,10 +54,10 @@ build() {
       --enable-add-ons
       --enable-bind-now
       --enable-lock-elision
-      --enable-multi-arch
+      --@MULTILIB@-multi-arch
       --enable-stack-protector=strong
       --enable-stackguard-randomization
-      --enable-static-pie
+      --disable-static-pie
       --disable-profile
       --disable-werror
   )
@@ -70,6 +71,8 @@ build() {
 
   # remove fortify for building libraries
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+  CFLAGS="$CFLAGS -no-pie -fno-PIE"
+  CXXFLAGS="$CXXFLAGS -no-pie -fno-PIE"
 
   "$srcdir/glibc/configure" \
       --libdir=/usr/lib \
@@ -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 @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() {