[arch-commits] Commit in multipath-tools/trunk (0002-make.patch PKGBUILD)

[Christian Hesse]

    Date: Wednesday, May 6, 2020 @ 07:46:11
  Author: eworm
Revision: 625022

upgpkg: multipath-tools 0.8.4-1

new upstream release

Added:
  multipath-tools/trunk/0002-make.patch
Modified:
  multipath-tools/trunk/PKGBUILD

-----------------+
 0002-make.patch |   28 ++++++++++++++++++++++++++++
 PKGBUILD        |   20 ++++++++++++--------
 2 files changed, 40 insertions(+), 8 deletions(-)

Added: 0002-make.patch
===================================================================
--- 0002-make.patch	                        (rev 0)
+++ 0002-make.patch	2020-05-06 07:46:11 UTC (rev 625022)
@@ -0,0 +1,28 @@
+From 78b28aac918ebe8f4008ff05424182e06d7082f7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Wed, 6 May 2020 09:29:55 +0200
+Subject: libmpathpersist: depend on libmultipath
+
+Without this the build fails with:
+
+/usr/bin/ld: cannot find -lmultipath
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 1dee3680..ba1d73ba 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@ all:	$(BUILDDIRS)
+ $(BUILDDIRS):
+ 	$(MAKE) -C $@
+ 
+-multipath multipathd mpathpersist: libmultipath
++libmpathpersist multipath multipathd mpathpersist: libmultipath
+ mpathpersist:  libmpathpersist
+ 
+ $(BUILDDIRS.clean):
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-06 06:28:55 UTC (rev 625021)
+++ PKGBUILD	2020-05-06 07:46:11 UTC (rev 625022)
@@ -8,8 +8,8 @@
 # Contributor: Matt Heagney <matt at heagney.com>
 
 pkgname=multipath-tools
-pkgver=0.8.3
-pkgrel=3
+pkgver=0.8.4
+pkgrel=1
 pkgdesc='Multipath tools for Linux (including kpartx)'
 arch=('x86_64')
 url='http://christophe.varoqui.free.fr/'
@@ -17,9 +17,11 @@
 depends=('libaio' 'device-mapper' 'json-c' 'liburcu' 'systemd-libs')
 makedepends=('git')
 source=("multipath-tools::git+https://git.opensvc.com/multipath-tools/.git#tag=${pkgver}"
-        '0001-fix-boolean-value-with-json-c-0.14.patch')
+        '0001-fix-boolean-value-with-json-c-0.14.patch'
+        '0002-make.patch')
 sha256sums=('SKIP'
-            '9aa4970790616637e0cc1b2ae609ca6bffb57effda0e8263fa73cbefc7f16a11')
+            '9aa4970790616637e0cc1b2ae609ca6bffb57effda0e8263fa73cbefc7f16a11'
+            '95de3c6f42c8c80ee3ced00cefad7f003abdbf9358fcf72042d17819e871048a')
 
 prepare() {
   cd "${pkgname}"
@@ -31,6 +33,7 @@
   sed -i 's|$(exec_prefix)/sbin|$(exec_prefix)/bin|g' Makefile.inc
 
   patch -Np1 < ../0001-fix-boolean-value-with-json-c-0.14.patch
+  patch -Np1 < ../0002-make.patch
 }
 
 build() {
@@ -42,8 +45,9 @@
 package() {
   cd "${pkgname}"
 
-  make DESTDIR="${pkgdir}" \
-       exec_prefix="/usr" \
-       LIB="/usr/lib" \
-       install
+  make -j1 \
+    DESTDIR="${pkgdir}" \
+    exec_prefix="/usr" \
+    LIB="/usr/lib" \
+    install
 }