updating some more stage4 patches

12 files changed, 116 insertions, 100 deletions

diff --git a/src/stage2/patches/powerpc64le/pacman.patch b/src/stage2/patches/powerpc64le/pacman.patch
index 9eada0a..bfd1a4f 100644
--- a/src/stage2/patches/powerpc64le/pacman.patch
+++ b/src/stage2/patches/powerpc64le/pacman.patch
@@ -156,7 +156,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
 +      @CARCH@)
 +        mycarch="@CARCH@"
 +        mychost="@CHOST@"
-+        myflags="@PLATFORM_FLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
++        myflags="@PLATFORM_CFLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
 +        ;;
      esac
      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
diff --git a/src/stage2/patches/riscv64/pacman.patch b/src/stage2/patches/riscv64/pacman.patch
index b3ceeed..bd22a94 100644
--- a/src/stage2/patches/riscv64/pacman.patch
+++ b/src/stage2/patches/riscv64/pacman.patch
@@ -150,7 +150,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
 +      @CARCH@)
 +        mycarch="@CARCH@"
 +        mychost="@CHOST@"
-+        myflags="@PLATFORM_FLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
++        myflags="@PLATFORM_CFLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
 +        ;;
      esac
      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
diff --git a/src/stage3/patches/powerpc64le/pacman.patch b/src/stage3/patches/powerpc64le/pacman.patch
index 08efd4a..49d004d 100644
--- a/src/stage3/patches/powerpc64le/pacman.patch
+++ b/src/stage3/patches/powerpc64le/pacman.patch
@@ -163,7 +163,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
 +      @CARCH@)
 +        mycarch="@CARCH@"
 +        mychost="@CHOST@"
-+        myflags="@PLATFORM_FLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
++        myflags="@PLATFORM_CFLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
 +        ;;
      esac
      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
diff --git a/src/stage4/patches/generic/boost.patch b/src/stage4/patches/generic/boost.patch
index da60b61..6d3c035 100644
--- a/src/stage4/patches/generic/boost.patch
+++ b/src/stage4/patches/generic/boost.patch
@@ -1,11 +1,12 @@
---- a/PKGBUILD	2018-03-17 18:52:01.668936255 +0100
-+++ b/PKGBUILD	2018-03-17 19:06:24.436261723 +0100
-@@ -28,7 +28,7 @@ build() {
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-06 17:17:39.352815084 +0200
++++ b/PKGBUILD	2018-06-06 17:17:47.479481833 +0200
+@@ -38,6 +38,8 @@ build() {
  
-    ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2
- 
--   _bindir="bin.linuxx86"
 +   _bindir="bin.linux"
     [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64"
++   [[ "${CARCH}" = "riscv64" ]] && _bindir="bin.linux"
++   [[ "${CARCH}" = "powerpc64le" ]] && _bindir="bin.linuxppc"
     install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2
  
+    # Support for OpenMPI
diff --git a/src/stage4/patches/generic/cairo.patch b/src/stage4/patches/generic/cairo.patch
index 51f3685..6fb31ae 100644
--- a/src/stage4/patches/generic/cairo.patch
+++ b/src/stage4/patches/generic/cairo.patch
@@ -1,11 +1,12 @@
---- a/PKGBUILD	2018-04-03 23:44:52.137752947 +0200
-+++ b/PKGBUILD	2018-04-04 08:09:09.899885197 +0200
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-07 01:24:18.836439771 +0200
++++ b/PKGBUILD	2018-06-07 07:37:28.609996506 +0200
 @@ -10,7 +10,7 @@ url="https://cairographics.org/"
  arch=(x86_64)
  license=(LGPL MPL)
  depends=(libpng libxrender libxext fontconfig pixman glib2 lzo)
 -makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc valgrind git)
 +makedepends=(librsvg gtk2 poppler-glib libspectre gtk-doc git)
- _commit=1ed124ace201946177eab962d3b07bb2fedf9026  # master
+ _commit=7149686456ec3c481fa1d3dbe76a0dab1e42b519  # tags/1.15.12^0
  source=("git+https://anongit.freedesktop.org/git/cairo#commit=$_commit"
          utf-8.diff)
diff --git a/src/stage4/patches/generic/graphviz.patch b/src/stage4/patches/generic/graphviz.patch
index 6478656..24e53df 100644
--- a/src/stage4/patches/generic/graphviz.patch
+++ b/src/stage4/patches/generic/graphviz.patch
@@ -1,10 +1,10 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-10 16:06:17.697039349 +0200
-+++ b/PKGBUILD	2018-04-10 16:07:11.543034246 +0200
+--- a/PKGBUILD	2018-06-06 23:22:48.539700362 +0200
++++ b/PKGBUILD	2018-06-07 07:29:31.799991748 +0200
 @@ -11,9 +11,8 @@ url='http://www.graphviz.org/'
  license=('CPL')
  arch=('x86_64')
- depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts')
+ depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts' 'libnsl')
 -makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2')
 -optdepends=('mono: sharp bindings'
 -            'guile: guile bindings'
diff --git a/src/stage4/patches/generic/libraqm.patch b/src/stage4/patches/generic/libraqm.patch
new file mode 100644
index 0000000..08591bb
--- /dev/null
+++ b/src/stage4/patches/generic/libraqm.patch
@@ -0,0 +1,12 @@
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-07 01:13:28.823099951 +0200
++++ b/PKGBUILD	2018-06-07 07:36:33.653329291 +0200
+@@ -9,7 +9,7 @@ arch=(x86_64)
+ url='https://github.com/HOST-Oman/libraqm/'
+ license=(MIT)
+ depends=(freetype2 fribidi)
+-makedepends=(gtk-doc)
++makedepends=(gtk-doc harfbuzz)
+ source=(https://github.com/HOST-Oman/libraqm/releases/download/v$pkgver/raqm-$pkgver.tar.gz)
+ sha256sums=('a06036ad6bd0abdc656de0b4189cc7f397ec1beb17061012732e32761a02c989')
+ 
diff --git a/src/stage4/patches/generic/openmpi.patch b/src/stage4/patches/generic/openmpi.patch
index 84a7808..502b293 100644
--- a/src/stage4/patches/generic/openmpi.patch
+++ b/src/stage4/patches/generic/openmpi.patch
@@ -1,9 +1,10 @@
---- a/PKGBUILD	2018-03-26 17:03:14.320737909 +0200
-+++ b/PKGBUILD	2018-03-26 17:16:23.224859727 +0200
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-07 02:49:14.843157282 +0200
++++ b/PKGBUILD	2018-06-07 07:39:06.099997479 +0200
 @@ -10,7 +10,7 @@ url='https://www.open-mpi.org'
  arch=('x86_64')
  license=('custom:OpenMPI')
- depends=('libltdl' 'hwloc' 'openssh')
+ depends=('libltdl' 'hwloc' 'openssh' 'zlib' 'libnl')
 -makedepends=('inetutils' 'valgrind' 'gcc-fortran')
 +makedepends=('inetutils' 'gcc-fortran')
  optdepends=('gcc-fortran: fortran support')
diff --git a/src/stage4/patches/generic/systemd.patch b/src/stage4/patches/generic/systemd.patch
index f915824..1aa95dc 100644
--- a/src/stage4/patches/generic/systemd.patch
+++ b/src/stage4/patches/generic/systemd.patch
@@ -1,6 +1,6 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-17 19:26:37.026578845 +0200
-+++ b/PKGBUILD	2018-04-17 22:07:42.832662745 +0200
+--- a/PKGBUILD	2018-06-06 05:21:02.252386067 +0200
++++ b/PKGBUILD	2018-06-06 06:15:14.332418516 +0200
 @@ -85,6 +85,10 @@ sha512sums=('SKIP'
  _backports=(
    # nspawn: wait for network namespace creation before interface setup (#8633)
@@ -12,7 +12,18 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  )
  
  _reverts=(
-@@ -261,7 +265,7 @@ package_systemd() {
+@@ -134,7 +138,9 @@ prepare() {
+   git remote add -f upstream ../systemd
+   git checkout "$_commit"
+ 
+-  _validate_tag || return
++  # temporary hack due to upstream build issues
++  # https://tests.reproducible-builds.org/archlinux/core/systemd/build1.log
++  #_validate_tag || return
+ 
+   local c
+   for c in "${_backports[@]}"; do
+@@ -261,7 +267,7 @@ package_systemd() {
    rm -rv "$pkgdir"/etc/systemd/system/*
  
    # we'll create this on installation
diff --git a/src/stage4/patches/generic/texlive-bin.texlive-bin.patch b/src/stage4/patches/generic/texlive-bin.texlive-bin.patch
index 80a5e83..5b613ce 100644
--- a/src/stage4/patches/generic/texlive-bin.texlive-bin.patch
+++ b/src/stage4/patches/generic/texlive-bin.texlive-bin.patch
@@ -1,15 +1,11 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-11 06:12:11.168229069 +0200
-+++ b/PKGBUILD	2018-04-11 06:12:11.169229069 +0200
-@@ -9,18 +9,15 @@
- # parabola changes and rationale:
- #  - rebranded to parabola
- 
--pkgname=('texlive-bin')
-+pkgname=('texlive-bin' 'libsynctex')
+--- a/PKGBUILD	2018-06-07 01:03:40.376427415 +0200
++++ b/PKGBUILD	2018-06-07 07:34:49.533328252 +0200
+@@ -12,20 +12,12 @@
+ pkgname=('texlive-bin')
  pkgver=2017.44590
- pkgrel=13
--pkgrel+=.parabola1
+ pkgrel=14
+-pkgrel+=.parabola2
  license=('GPL')
  arch=('x86_64')
 -arch+=('i686' 'armv7h')
@@ -17,12 +13,17 @@ diff -rupN a/PKGBUILD b/PKGBUILD
           'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
           'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
 -         'perl' 'clisp' 'ffcall')
--makedepends+=('poppler=0.63.0' 'icu>=61' 'icu<62')
+-case "$CARCH" in
+-  i686)
+-    makedepends+=('poppler=0.63.0' 'icu>=61' 'icu<62') ;;
+-  armv7h|x86_64)
+-    makedepends+=('poppler=0.64.0' 'icu>=61' 'icu<62') ;;
+-esac
 +         'perl')
  url='http://tug.org/texlive/'
  source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
          "luatex-gcc7.patch"
-@@ -52,12 +49,6 @@ prepare() {
+@@ -62,12 +54,6 @@ prepare() {
  build() {
     cd "$srcdir"
  
@@ -35,7 +36,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
     #############################################################
     ### configure
     cd source
-@@ -105,8 +96,7 @@ build() {
+@@ -115,8 +101,7 @@ build() {
       --disable-dump-share \
       --disable-aleph \
       --enable-luatex \
@@ -45,7 +46,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
     #############################################################
     ### make
     echo "-------------------------------------------------------"
-@@ -115,6 +105,15 @@ build() {
+@@ -125,6 +110,15 @@ build() {
     make
  }
  
@@ -61,17 +62,17 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  package_texlive-bin() {
     pkgdesc="TeX Live binaries"
     pkgdesc+=" (Parabola rebranded)"
-@@ -122,8 +121,7 @@ package_texlive-bin() {
+@@ -132,8 +126,7 @@ package_texlive-bin() {
              'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
              'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
              'libsynctex')
--   depends+=('icu>=61' 'icu<62' 'poppler=0.63.0')
+-   depends+=('icu>=61' 'icu<62' 'poppler=0.64.0')
 -   provides=('lcdf-typetools' 'kpathsea' 'xindy')
 +   provides=('lcdf-typetools' 'kpathsea')
     optdepends=('ed: for texconfig'
                 'biber: for bibliography processing')
     options=('!strip')
-@@ -133,8 +131,6 @@ package_texlive-bin() {
+@@ -143,8 +136,6 @@ package_texlive-bin() {
     #############################################################
     ### install
     cd source
@@ -80,7 +81,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  
     echo "-------------------------------------------------------"
     echo "--> Proceeding with make install ..."
-@@ -307,7 +303,6 @@ texdoc
+@@ -317,7 +308,6 @@ texdoc
  texdoctk
  texexec
  texfot
@@ -88,7 +89,7 @@ diff -rupN a/PKGBUILD b/PKGBUILD
  texlinks
  texliveonfly
  texloganalyser
-@@ -323,11 +318,7 @@ updmap-user
+@@ -333,11 +323,7 @@ updmap-user
  vpl2ovp
  vpl2vpl
  xhlatex
diff --git a/src/stage4/patches/powerpc64le/mesa.patch b/src/stage4/patches/powerpc64le/mesa.patch
index 3518f01..e4b977e 100644
--- a/src/stage4/patches/powerpc64le/mesa.patch
+++ b/src/stage4/patches/powerpc64le/mesa.patch
@@ -1,18 +1,18 @@
 diff -rupN a/PKGBUILD b/PKGBUILD
---- a/PKGBUILD	2018-04-10 10:23:30.086988693 +0200
-+++ b/PKGBUILD	2018-04-10 10:23:30.087988693 +0200
-@@ -9,7 +9,7 @@ pkgrel=1.parabola1
+--- a/PKGBUILD	2018-06-07 00:14:42.959731440 +0200
++++ b/PKGBUILD	2018-06-07 07:32:17.853326738 +0200
+@@ -10,7 +10,7 @@ pkgrel=1.parabola2
  arch=('i686' 'x86_64' 'armv7h')
  makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
               'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
--             'elfutils' 'llvm' 'libomxil-bellagio' 'clang' 'libglvnd' 'lm_sensors')
-+             'elfutils' 'llvm' 'libomxil-bellagio' 'libglvnd' 'lm_sensors')
+-             'elfutils' 'llvm' 'libomxil-bellagio' 'clang' 'libglvnd' 'lm_sensors'
++             'elfutils' 'llvm' 'libomxil-bellagio' 'libglvnd' 'lm_sensors'
+              'meson')
  makedepends_x86_64=('libclc' 'libunwind')
  makedepends_i686=("${makedepends_x86_64[@]}")
- url="https://www.mesa3d.org/"
-@@ -57,6 +57,14 @@ build() {
-       VDPAU_AND_XA=
-       OPENCL=
+@@ -76,6 +76,14 @@ build() {
+       GALLIUM_XA=false
+       LIBUNWIND=false
        ;;
 +    powerpc64le)
 +      GALLIUM=r300,r600,radeonsi,nouveau,swrast,virgl
@@ -24,26 +24,16 @@ diff -rupN a/PKGBUILD b/PKGBUILD
 +      ;;
    esac
  
-   ./configure --prefix=/usr \
-@@ -85,8 +93,7 @@ build() {
-     $VDPAU_AND_XA \
-     --enable-omx-bellagio \
-     --enable-nine \
--    $OPENCL \
--    --with-clang-libdir=/usr/lib
-+    $OPENCL
- 
-   make
- 
-@@ -125,11 +132,6 @@ package_mesa() {
-   cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/
-   cp -rv ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/
+   arch-meson mesa-$pkgver build \
+@@ -158,11 +166,6 @@ package_mesa() {
+     _install fakeinstall/usr/lib/libwayland*.so*
+   fi
  
 -  if [ "$CARCH" != "armv7h" ]; then
--    cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/
--    cp -rv ${srcdir}/fakeinstall/usr/lib/libswrAVX*.so* ${pkgdir}/usr/lib/
+-    _install fakeinstall/usr/lib/libxatracker.so*
+-    _install fakeinstall/usr/lib/libswrAVX*.so*
 -  fi
 -
-   cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
-   cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+   # in libglvnd
+   rm -v fakeinstall/usr/lib/libGLESv{1_CM,2}.so*
  
diff --git a/src/stage4/patches/powerpc64le/pacman.patch b/src/stage4/patches/powerpc64le/pacman.patch
index 09c563a..840eb5d 100644
--- a/src/stage4/patches/powerpc64le/pacman.patch
+++ b/src/stage4/patches/powerpc64le/pacman.patch
@@ -1,36 +1,6 @@
---- a/PKGBUILD	2018-03-17 22:43:27.776000901 +0100
-+++ b/PKGBUILD	2018-03-17 22:45:57.506623741 +0100
-@@ -21,7 +20,7 @@ groups=('base' 'base-devel' 'base-openrc
-          'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring'
-          'archlinuxarm-keyring' 'archlinux32-keyring')
- makedepends=('asciidoc')
--makedepends+=('openssl>=1.1' 'openssl-1.0') # for during openssl 1.0->1.1 rebuild; remove on next rebuild
-+makedepends+=('openssl>=1.1')
- checkdepends=('python2' 'fakechroot')
- optdepends=('cron: run specified programs at scheduled times and related tools')
- provides=("$pkgname-contrib")
-@@ -45,6 +43,7 @@ sha256sums=('dfd36086ad68564bcd977f4a1fa
-             '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
-             '1b2c8f4ec84d0dc496516880a54b5e4deb78798618c9cf5e284a45303f156e58'
-             'b2cb3ba229edba338c0af7d7f5bb1a6ef6143bcd453c693bfee0c02fa1cfa18a'
-+            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
-             '0d174c7c47921cfbb35dacb9d099095e78f6f67bfaa86836a3e588552f14ed03'
-             '1df848c5038a3f81ae4dc79a4072d340109b02f56292a5c4a20c59f735edd2b3'
-             '1cc4af1cf8e2133d4520827cc7d3ffad731892595f8e699909002d2e40ad8df9'
-@@ -96,6 +95,11 @@ build() {
-         mychost="armv7l-unknown-linux-gnueabihf"
-         myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt"
-         ;;
-+      @CARCH@)
-+        mycarch="@CARCH@"
-+        mychost="@CHOST@"
-+        myflags="@PLATFORM_CFLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
-+        ;;
-     esac
-     myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
- 
---- /dev/null	2018-03-05 07:42:50.020223709 +0100
-+++ b/pacman.conf.powerpc64le	2018-03-17 22:43:27.778000923 +0100
+diff -rupN a/pacman.conf.powerpc64le b/pacman.conf.powerpc64le
+--- a/pacman.conf.powerpc64le	1970-01-01 01:00:00.000000000 +0100
++++ b/pacman.conf.powerpc64le	2018-06-06 21:47:49.619643499 +0200
 @@ -0,0 +1,120 @@
 +#
 +# /etc/pacman.conf
@@ -152,3 +122,32 @@
 +#[custom]
 +#SigLevel = Optional TrustAll
 +#Server = file:///home/custompkgs
+diff -rupN a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD	2018-06-06 20:05:55.006249157 +0200
++++ b/PKGBUILD	2018-06-06 21:47:37.022976706 +0200
+@@ -43,10 +43,11 @@ source=(https://sources.archlinux.org/ot
+         0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch)
+ sha256sums=('9f5993fc8923530713742f15df284677f297b3eca15ed7a24758c98ac7399bd3'
+             'SKIP'
+-            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
+             '1b2c8f4ec84d0dc496516880a54b5e4deb78798618c9cf5e284a45303f156e58'
++            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
++            '19853ea9a2138157bbb334eb7f3a9b3098b88e513678b54b7b4f19d2ffd6ecad'
+             'b2cb3ba229edba338c0af7d7f5bb1a6ef6143bcd453c693bfee0c02fa1cfa18a'
+-            '31565aae027a26bb0e9074aca89a012483dc078e0239dc225c3c15fced526607'
++            'ecef1e98eaaf207f4f2c3d07cfe13533866e1e774240eb833e8b3bd691ada95f'
+             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
+             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
+             '635ef682073878b6273e3376b00a89a572c4f5f39b118f7b0b4c7497a265a16c'
+@@ -96,6 +97,11 @@ build() {
+         mychost="armv7l-unknown-linux-gnueabihf"
+         myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt"
+         ;;
++      @CARCH@)
++        mycarch="@CARCH@"
++        mychost="@CHOST@"
++        myflags="@PLATFORM_CFLAGS@ -O2 -pipe -fstack-protector-strong -fno-plt"
++        ;;
+     esac
+     myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+