[arch-commits] Commit in gcin/trunk (PKGBUILD)

[Chih-Hsuan Yen]

    Date: Friday, May 15, 2020 @ 07:37:18
  Author: yan12125
Revision: 628016

upgpkg: gcin 2.8.9-5; proper inject CFLAGS/CPPFLAGS/LDFLAGS so that all binaries are hardened; fix building with GCC 10

Modified:
  gcin/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-15 07:00:40 UTC (rev 628015)
+++ PKGBUILD	2020-05-15 07:37:18 UTC (rev 628016)
@@ -6,7 +6,7 @@
 
 pkgname=gcin
 pkgver=2.8.9
-pkgrel=4
+pkgrel=5
 pkgdesc='Input method server supporting various input methods'
 url='https://hyperrate.com/dir.php?eid=67'
 license=('LGPL')
@@ -24,14 +24,17 @@
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    sed 's/lib64/lib/g' -i configure
-    sed '/include suffixes-rule/a \
-        CFLAGS+='"${CFLAGS}"' \
-        LDFLAGS+='"${LDFLAGS}"' \
-        OPTFLAGS=' \
-        -i Makefile
-    sed \
-        -e 's:QT=qt5:QT=qt:' \
+
+    # XXX: workaround build failure with GCC 10
+    export CFLAGS="$CFLAGS -fcommon"
+
+    sed -e 's/lib64/lib/g' \
+        -e "s/^OPTFLAGS=.*/OPTFLAGS=\"$CFLAGS $CPPFLAGS\"/" \
+        -e "s/echo \"LDFLAGS=/echo \"LDFLAGS=$LDFLAGS /" \
+        -e "s/echo \"SO_FLAGS=/echo \"SO_FLAGS=$LDFLAGS /" \
+        -i configure
+    sed -e 's:QT=qt5:QT=qt:' \
+        -e "s/^LDFLAGS=/LDFLAGS=$LDFLAGS /" \
         -i qt5-im/Makefile59
     patch -Np1 -i ../fix-gtk-immodules-path.patch
 }