Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BCF5286A9 for ; Sun, 12 Jan 2025 20:04:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736712287; cv=none; b=SauISVJ7fdwcEp3waK2yQcujZEQ/pGABjOC7ECPdC/x9324S2ayVucjHrr9x1qRIqgcbPvjQ8LEGzCvFyt7TWk7cVOceHt+586qFsQpLSIfG+u5I7MxDJLgZF0i9tAfJsMtCF2qkXAUKm/ERJsxKrd7/i8MlBNYk1K+AhV8Uc/8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736712287; c=relaxed/simple; bh=MBNBD9utT1iUzOW88KQUi/YdduqG2srWbICTuogTIs0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YX5NF0XvsYVftXcWc5E8siKP3XfWmZeTQDyZLs2e+z5LWV3W+8g9nJuPoz7ZOp3vH/7BCZ9PcZIUX4LaTYFCGkNycF5EUEL1B0xu7d01zvLOhtyd/Ryi2gKohbuPIwq6NzIxUhjDiBVI9VQ0yrtdp3xX/4I4RqzLdl6M6fv6Yfs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=none smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=O2VbVYJv; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="O2VbVYJv" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:To:From:Reply-To:Cc: Content-Type:Content-ID:Content-Description; bh=piaBvGt8fEC0FXKaF8yH4epboCiQ2Yfqvdqol7NaZls=; b=O2VbVYJv8PcWFMaRx5Sp4HfA6r IMvGn3UEk1TeYdmt6JoQZrVR+2mT1zgaM1dJGTDmBgVYIAoyCUWVTFeKSND+5xTPwyHJ/HpdZDCrJ CHUcG6nsTMkJPN32LrFi4Gflnm2T4iH5pS3lK3Iz6qmC+PEgI+ephogwWf9i4f4QlW3QcSDKJ4r3e tPi+Bx2AQ7b+cBIqGDq2qZb2idmDxCt1xHkS87lcCtfVvD2Ea+p9MPaRATBr/xAhq041050c3UHqz 3XHHIOuEUnTfXATpF9oyqVLcvj4pqQyK9AA00+692MB+/m6O5jIcLBuLJkgpFLKJSiUqRbs+6HBRW Om+sIZpA==; Received: from authenticated user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1tX4CK-00H6mj-EO for lvs-devel@vger.kernel.org; Sun, 12 Jan 2025 20:04:36 +0000 Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by taras.nevrast.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tX4CJ-000H3S-0x for lvs-devel@vger.kernel.org; Sun, 12 Jan 2025 20:04:35 +0000 From: Jeremy Sowden To: LVS Devel Subject: [PATCH ipvsadm 3/5] Use variable for pkg-config in Makefiles Date: Sun, 12 Jan 2025 20:03:31 +0000 Message-ID: <20250112200333.3180808-4-azazel@debian.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250112200333.3180808-1-azazel@debian.org> References: <20250112200333.3180808-1-azazel@debian.org> Precedence: bulk X-Mailing-List: lvs-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: azazel@debian.org X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false X-Debian-User: azazel 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 --- 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