[arch-commits] Commit in fcgiwrap/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, November 10, 2018 @ 05:52:48
  Author: foutrelis
Revision: 405637

Fix build with current systemd and gcc

Added:
  fcgiwrap/trunk/link-with-libsystemd-instead-of-libsystemd-daemon.patch
Modified:
  fcgiwrap/trunk/PKGBUILD

---------------------------------------------------------+
 PKGBUILD                                                |   15 +++++++-
 link-with-libsystemd-instead-of-libsystemd-daemon.patch |   26 ++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-10 05:52:43 UTC (rev 405636)
+++ PKGBUILD	2018-11-10 05:52:48 UTC (rev 405637)
@@ -11,14 +11,27 @@
 license=('MIT')
 depends=('fcgi' 'systemd')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/gnosek/fcgiwrap/archive/${pkgver}.tar.gz"
+        'link-with-libsystemd-instead-of-libsystemd-daemon.patch'
         'LICENSE')
 md5sums=('d14f56bda6758a6e02aa7b3fb125cbce'
+         'b2428010802d80c577553ee8c0fd8d7a'
          '5aee62c27b4308f25ab32f05da387366')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # https://github.com/gnosek/fcgiwrap/pull/37
+  patch -Np1 -i ../link-with-libsystemd-instead-of-libsystemd-daemon.patch
+
+  autoreconf -vi
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  autoreconf --install
+  # -Werror is not much fun in release builds
+  CFLAGS+=' -Wno-error=implicit-fallthrough'
+
   # Here --sbindir is implicitly prefixed by /usr
   ./configure --prefix=/usr --mandir=/share/man --sbindir=/bin --with-systemd
   make

Added: link-with-libsystemd-instead-of-libsystemd-daemon.patch
===================================================================
--- link-with-libsystemd-instead-of-libsystemd-daemon.patch	                        (rev 0)
+++ link-with-libsystemd-instead-of-libsystemd-daemon.patch	2018-11-10 05:52:48 UTC (rev 405637)
@@ -0,0 +1,26 @@
+From e621d6acb538d717d6767429e3f85190019a887d Mon Sep 17 00:00:00 2001
+From: Thomas Claveirole <thomas.claveirole at green-communications.fr>
+Date: Mon, 18 Jul 2016 15:06:59 +0200
+Subject: [PATCH] configure.ac: Check for libsystemd, not libsystemd-daemon.
+
+Newer versions of systemd do not provide libsystemd-daemon anymore.
+Therefore, use libsystemd instead.
+
+Signed-off-by: Thomas Claveirole <thomas.claveirole at green-communications.fr>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb3674e..2b02ef4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@ AC_ARG_WITH([systemd],
+   [], [with_systemd=check])
+ have_systemd=no
+ if test "x$with_systemd" != "xno"; then
+-  PKG_CHECK_MODULES(systemd, [libsystemd-daemon],
++  PKG_CHECK_MODULES(systemd, [libsystemd],
+     [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available])
+     have_systemd=yes],
+   have_systemd=no)