c5432960d9
Update to the head of the upstream staging branch
* Previous patches 0001-0042 are included in the source tarball
* Patches 0001-0032 are from the upstream staging branch
Rename redhat patches
* Previous patches 0043-0053 are now patches 0033-0043
Change back to using readline instead of libedit
* The code the uses readline has been isolated from the code that
is licensed gpl v2 only.
Add libmpathutil libraries to spec file
Add multipathc program to spec file
Add multipath.conf systemd tempfile configuration to spec file
Misc spec file cleanups
113 lines
4.3 KiB
Diff
113 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Thu, 27 Oct 2022 17:35:48 +0200
|
|
Subject: [PATCH] multipath-tools: Makefile.inc: use simple make variables
|
|
consistently
|
|
|
|
"Simply expanded" make variables are generally preferred over "recursively
|
|
expanded" make variables, unless they reference other variables that are
|
|
defined over overwritten further down in the Makefile (see
|
|
https://www.gnu.org/software/make/manual/html_node/Flavors.html).
|
|
Using them makes the code easier to read and even somewhat faster.
|
|
|
|
We've been adding simply expanded variables over time, but most older
|
|
code still uses recursively expanded ones. Try to be consistent, at least
|
|
in Makefile.inc.
|
|
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
Makefile.inc | 50 +++++++++++++++++++++++++-------------------------
|
|
1 file changed, 25 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
|
index 17707a3e..86602e2a 100644
|
|
--- a/Makefile.inc
|
|
+++ b/Makefile.inc
|
|
@@ -32,11 +32,11 @@ SYSTEMD := $(strip $(or $(shell $(PKGCONFIG) --modversion libsystemd 2>/dev/null
|
|
$(shell systemctl --version 2>/dev/null | sed -n 's/systemd \([0-9]*\).*/\1/p')))
|
|
|
|
# Paths. All these can be overridden on the "make" command line.
|
|
-prefix =
|
|
+prefix :=
|
|
# Prefix for binaries
|
|
-exec_prefix = $(prefix)
|
|
+exec_prefix := $(prefix)
|
|
# Prefix for non-essential libraries (libdmmp)
|
|
-usr_prefix = $(prefix)
|
|
+usr_prefix := $(prefix)
|
|
# Where to install systemd-related files. systemd is usually installed under /usr
|
|
# Note: some systemd installations use separate "prefix" and "rootprefix".
|
|
# In this case, override only unitdir to use systemd's "rootprefix" instead of $(systemd_prefix)
|
|
@@ -46,13 +46,13 @@ tmpfilesdir := $(systemd_prefix)/lib/tmpfiles.d
|
|
modulesloaddir := $(systemd_prefix)/lib/modules-load.d
|
|
libudevdir := $(systemd_prefix)/lib/udev
|
|
udevrulesdir := $(libudevdir)/rules.d
|
|
-bindir = $(exec_prefix)/sbin
|
|
+bindir := $(exec_prefix)/sbin
|
|
mandir := $(usr_prefix)/share/man
|
|
LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
|
|
-syslibdir = $(prefix)/$(LIB)
|
|
-usrlibdir = $(usr_prefix)/$(LIB)
|
|
-includedir = $(usr_prefix)/include
|
|
-pkgconfdir = $(usrlibdir)/pkgconfig
|
|
+syslibdir := $(prefix)/$(LIB)
|
|
+usrlibdir := $(usr_prefix)/$(LIB)
|
|
+includedir := $(usr_prefix)/include
|
|
+pkgconfdir := $(usrlibdir)/pkgconfig
|
|
plugindir := $(prefix)/$(LIB)/multipath
|
|
configdir := $(prefix)/etc/multipath/conf.d
|
|
runtimedir := $(if $(shell test -L /var/run -o ! -d /var/run && echo 1),/run,/var/run)
|
|
@@ -60,10 +60,10 @@ devmapper_incdir := $(or $(shell $(PKGCONFIG) --variable=includedir devmapper),/
|
|
libudev_incdir := $(or $(shell $(PKGCONFIG) --variable=includedir libudev),/usr/include)
|
|
kernel_incdir := /usr/include
|
|
|
|
-GZIP_PROG = gzip -9 -c
|
|
-RM = rm -f
|
|
-LN = ln -sf
|
|
-INSTALL_PROGRAM = install
|
|
+GZIP_PROG := gzip -9 -c
|
|
+RM := rm -f
|
|
+LN := ln -sf
|
|
+INSTALL_PROGRAM := install
|
|
NV_VERSION_SCRIPT = $(VERSION_SCRIPT:%.version=%-nv.version)
|
|
|
|
# $(call TEST_CC_OPTION,option,fallback)
|
|
@@ -106,23 +106,23 @@ CPPFLAGS := $(FORTIFY_OPT) \
|
|
-DRUNTIME_DIR=\"$(runtimedir)\" \
|
|
-DCONFIG_DIR=\"$(configdir)\" -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
|
|
CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe
|
|
-BIN_CFLAGS = -fPIE -DPIE
|
|
-LIB_CFLAGS = -fPIC
|
|
-SHARED_FLAGS = -shared
|
|
+BIN_CFLAGS := -fPIE -DPIE
|
|
+LIB_CFLAGS := -fPIC
|
|
+SHARED_FLAGS := -shared
|
|
LDFLAGS := $(LDFLAGS) -Wl,-z,relro -Wl,-z,now -Wl,-z,defs
|
|
-BIN_LDFLAGS = -pie
|
|
+BIN_LDFLAGS := -pie
|
|
|
|
# Source code directories. Don't modify.
|
|
|
|
-multipathdir = $(TOPDIR)/libmultipath
|
|
-daemondir = $(TOPDIR)/multipathd
|
|
-mpathutildir = $(TOPDIR)/libmpathutil
|
|
-mpathpersistdir = $(TOPDIR)/libmpathpersist
|
|
-mpathcmddir = $(TOPDIR)/libmpathcmd
|
|
-mpathvaliddir = $(TOPDIR)/libmpathvalid
|
|
-thirdpartydir = $(TOPDIR)/third-party
|
|
-libdmmpdir = $(TOPDIR)/libdmmp
|
|
-nvmedir = $(TOPDIR)/libmultipath/nvme
|
|
+multipathdir := $(TOPDIR)/libmultipath
|
|
+daemondir := $(TOPDIR)/multipathd
|
|
+mpathutildir := $(TOPDIR)/libmpathutil
|
|
+mpathpersistdir := $(TOPDIR)/libmpathpersist
|
|
+mpathcmddir := $(TOPDIR)/libmpathcmd
|
|
+mpathvaliddir := $(TOPDIR)/libmpathvalid
|
|
+thirdpartydir := $(TOPDIR)/third-party
|
|
+libdmmpdir := $(TOPDIR)/libdmmp
|
|
+nvmedir := $(TOPDIR)/libmultipath/nvme
|
|
|
|
# Check whether a function with name $1 has been declared in header file $2.
|
|
check_func = $(shell \
|