1From c3436ec8a502a40579abf62be0a479fa9d7888ad Mon Sep 17 00:00:00 2001 2From: Changqing Li <changqing.li@windriver.com> 3Date: Tue, 4 Jun 2019 11:39:39 +0800 4Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation 5 6Do not look for systemd info on the host, and allow us to pass in CFLAGS 7using the OPTFLAGS variable. 8 9Upstream-Status: Inappropriate [embedded specific] 10 11Signed-off-by: Joe Slater <joe.slater@windriver.com> 12 13Update for version 0.5.0-144-g770e6d0 14 15Signed-off-by: Kai Kang <kai.kang@windriver.com> 16 17Update for version 0.7.1 18 19Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 20 21update for version 0.7.7 22 23remove change about CFLAGS part, since patch 0024 already have similar function. 24 25Signed-off-by: Changqing Li <changqing.li@windriver.com> 26 27update for version 0.8.1 28Signed-off-by: Changqing Li <changqing.li@windriver.com> 29--- 30 Makefile.inc | 11 ----------- 31 1 file changed, 11 deletions(-) 32 33diff --git a/Makefile.inc b/Makefile.inc 34index 661f141..3f9fd28 100644 35--- a/Makefile.inc 36+++ b/Makefile.inc 37@@ -35,17 +35,6 @@ ifndef RUN 38 endif 39 endif 40 41-ifndef SYSTEMD 42- ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) 43- SYSTEMD = $(shell pkg-config --modversion libsystemd) 44- else 45- ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1) 46- SYSTEMD = $(shell systemctl --version 2> /dev/null | \ 47- sed -n 's/systemd \([0-9]*\).*/\1/p') 48- endif 49- endif 50-endif 51- 52 ifndef SYSTEMDPATH 53 SYSTEMDPATH=usr/lib 54 endif 55-- 562.7.4 57 58