LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[PATCH ipvsadm 3/5] Use variable for pkg-config in Makefiles

To: LVS Devel <lvs-devel@xxxxxxxxxxxxxxx>
Subject: [PATCH ipvsadm 3/5] Use variable for pkg-config in Makefiles
From: Jeremy Sowden <azazel@xxxxxxxxxx>
Date: Sun, 12 Jan 2025 20:03:31 +0000
Replace hard-coded `pkg-config` with a variable to allow it to be
overridden, which is helpful for cross-building.

Link: https://bugs.debian.org/901275
Signed-off-by: Jeremy Sowden <azazel@xxxxxxxxxx>
---
 Makefile         |  9 +++++----
 libipvs/Makefile | 17 +++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 91a2991f6746..d247d4075160 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ RPMSOURCEDIR  = $(shell rpm --eval '%_sourcedir')
 RPMSPECDIR     = $(shell rpm --eval '%_specdir')
 
 CC             = gcc
+PKG_CONFIG     ?= pkg-config
 INCLUDE                =
 SBIN           = $(BUILD_ROOT)/sbin
 MANDIR         = usr/man
@@ -66,10 +67,10 @@ OBJS                = ipvsadm.o config_stream.o 
dynamic_array.o
 LIBS           = -lpopt
 ifneq (0,$(HAVE_NL))
 LIBS           += $(shell \
-               if which pkg-config > /dev/null 2>&1; then \
-                 if   pkg-config --libs libnl-genl-3.0  2> /dev/null; then :;\
-                 elif pkg-config --libs libnl-2.0       2> /dev/null; then :;\
-                 elif pkg-config --libs libnl-1         2> /dev/null; then :;\
+               if which $(PKG_CONFIG) > /dev/null 2>&1; then \
+                 if   $(PKG_CONFIG) --libs libnl-genl-3.0  2> /dev/null; then 
:;\
+                 elif $(PKG_CONFIG) --libs libnl-2.0       2> /dev/null; then 
:;\
+                 elif $(PKG_CONFIG) --libs libnl-1         2> /dev/null; then 
:;\
                  fi; \
                else echo "-lnl"; fi)
 endif
diff --git a/libipvs/Makefile b/libipvs/Makefile
index f845c8b1675b..b31c8eac514d 100644
--- a/libipvs/Makefile
+++ b/libipvs/Makefile
@@ -1,14 +1,15 @@
 # Makefile for libipvs
 
 CC             = gcc
+PKG_CONFIG     ?= pkg-config
 CFLAGS         = -Wall -Wunused -Wstrict-prototypes -g -fPIC
 ifneq (0,$(HAVE_NL))
 CFLAGS         += -DLIBIPVS_USE_NL
 CFLAGS         += $(shell \
-               if which pkg-config > /dev/null 2>&1; then \
-                 if   pkg-config --cflags libnl-3.0  2> /dev/null; then :; \
-                 elif pkg-config --cflags libnl-2.0  2> /dev/null; then :; \
-                 elif pkg-config --cflags libnl-1    2> /dev/null; then :; \
+               if which $(PKG_CONFIG) > /dev/null 2>&1; then \
+                 if   $(PKG_CONFIG) --cflags libnl-3.0  2> /dev/null; then :; \
+                 elif $(PKG_CONFIG) --cflags libnl-2.0  2> /dev/null; then :; \
+                 elif $(PKG_CONFIG) --cflags libnl-1    2> /dev/null; then :; \
                  fi; \
                fi)
 endif
@@ -17,10 +18,10 @@ INCLUDE             += $(shell if [ -f ../../ip_vs.h ]; 
then        \
                     echo "-I../../."; fi;)
 DEFINES                = $(shell if [ ! -f ../../ip_vs.h ]; then       \
                    echo "-DHAVE_NET_IP_VS_H"; fi;)
-DEFINES                += $(shell if which pkg-config > /dev/null 2>&1; then \
-                        if   pkg-config --exists libnl-3.0; then :; \
-                        elif pkg-config --exists libnl-2.0; then :; \
-                        elif pkg-config --exists libnl-1; \
+DEFINES                += $(shell if which $(PKG_CONFIG) > /dev/null 2>&1; 
then \
+                        if   $(PKG_CONFIG) --exists libnl-3.0; then :; \
+                        elif $(PKG_CONFIG) --exists libnl-2.0; then :; \
+                        elif $(PKG_CONFIG) --exists libnl-1; \
                         then echo "-DFALLBACK_LIBNL1"; fi; fi)
 
 .PHONY         = all clean install dist distclean rpm rpms
-- 
2.45.2



<Prev in Thread] Current Thread [Next in Thread>