Update to v4.0.6 and cleanup * In v4.0.4, there's a stupid and severe bug so that upstream released v4.0.5 soon with an urgent fix * Upstream merged our fix for bsc#977201 with release v4.0.6, so I still use the 2 below bugs for this updates: * bsc#967332: libdlm: package update to v4.0.4 * bsc#977201: output of `dlm_tool ls` should distinguish causes OBS-URL: https://build.opensuse.org/request/show/408625 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/libdlm?expand=0&rev=58
35 lines
801 B
Diff
35 lines
801 B
Diff
Index: a/dlm_controld/Makefile
|
|
===================================================================
|
|
--- a/dlm_controld/Makefile
|
|
+++ b/dlm_controld/Makefile
|
|
@@ -1,6 +1,11 @@
|
|
DESTDIR=
|
|
PREFIX=/usr
|
|
-LIBNUM=/lib64
|
|
+cpu_bit=$(shell getconf LONG_BIT)
|
|
+ifeq ($(cpu_bit),64)
|
|
+ LIBNUM=/lib64
|
|
+else
|
|
+ LIBNUM=/lib
|
|
+endif
|
|
BINDIR=$(PREFIX)/sbin
|
|
LIBDIR=$(PREFIX)/$(LIBNUM)
|
|
HDRDIR=$(PREFIX)/include
|
|
Index: libdlm-4.0.2/libdlm/Makefile
|
|
===================================================================
|
|
--- libdlm-4.0.2.orig/libdlm/Makefile
|
|
+++ libdlm-4.0.2/libdlm/Makefile
|
|
@@ -1,6 +1,11 @@
|
|
DESTDIR=
|
|
PREFIX=/usr
|
|
-LIBNUM=/lib64
|
|
+cpu_bit=$(shell getconf LONG_BIT)
|
|
+ifeq ($(cpu_bit),64)
|
|
+ LIBNUM=/lib64
|
|
+else
|
|
+ LIBNUM=/lib
|
|
+endif
|
|
LIBDIR=$(PREFIX)/$(LIBNUM)
|
|
HDRDIR=$(PREFIX)/include
|
|
MANDIR=$(PREFIX)/share/man
|