From patchwork Mon Sep 1 13:19:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 4819511 Return-Path: X-Original-To: patchwork-linux-sparse@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D8FD1C0338 for ; Mon, 1 Sep 2014 13:43:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D617A20149 for ; Mon, 1 Sep 2014 13:43:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D12E20145 for ; Mon, 1 Sep 2014 13:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753318AbaIANn3 (ORCPT ); Mon, 1 Sep 2014 09:43:29 -0400 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:34714 "EHLO demumfd001.nsn-inter.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbaIANn2 (ORCPT ); Mon, 1 Sep 2014 09:43:28 -0400 X-Greylist: delayed 1283 seconds by postgrey-1.27 at vger.kernel.org; Mon, 01 Sep 2014 09:43:28 EDT Received: from demuprx016.emea.nsn-intra.net ([10.150.129.55]) by demumfd001.nsn-inter.net (8.14.3/8.14.3) with ESMTP id s81DM37K002261 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 1 Sep 2014 13:22:03 GMT Received: from ak-desktop.emea.nsn-net.net ([10.144.35.206]) by demuprx016.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id s81DM2pD019605; Mon, 1 Sep 2014 15:22:02 +0200 From: Aaro Koskinen To: Christopher Li , linux-sparse@vger.kernel.org Cc: Aaro Koskinen Subject: [PATCH] build: allow use of PKG_CONFIG to override pkg-config Date: Mon, 1 Sep 2014 16:19:18 +0300 Message-Id: <1409577558-27828-1-git-send-email-aaro.koskinen@nsn.com> X-Mailer: git-send-email 2.1.0 X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-size: 2364 X-purgate-ID: 151667::1409577723-0000061C-3E8B27B5/0/0 Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Allow overriding pkg-config e.g. when cross-compiling. Signed-off-by: Aaro Koskinen --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f453ded..f61aa87 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ CFLAGS += -Wall -Wwrite-strings LDFLAGS += -g LD = gcc AR = ar +PKG_CONFIG = pkg-config ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) # @@ -25,11 +26,11 @@ ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) # CFLAGS += -O0 -DDEBUG -g3 -gdwarf-2 # -HAVE_LIBXML:=$(shell pkg-config --exists libxml-2.0 2>/dev/null && echo 'yes') +HAVE_LIBXML:=$(shell $(PKG_CONFIG) --exists libxml-2.0 2>/dev/null && echo 'yes') HAVE_GCC_DEP:=$(shell touch .gcc-test.c && \ $(CC) -c -Wp,-MD,.gcc-test.d .gcc-test.c 2>/dev/null && \ echo 'yes'; rm -f .gcc-test.d .gcc-test.o .gcc-test.c) -HAVE_GTK2:=$(shell pkg-config --exists gtk+-2.0 2>/dev/null && echo 'yes') +HAVE_GTK2:=$(shell $(PKG_CONFIG) --exists gtk+-2.0 2>/dev/null && echo 'yes') LLVM_CONFIG:=llvm-config HAVE_LLVM:=$(shell $(LLVM_CONFIG) --version >/dev/null 2>&1 && echo 'yes') HAVE_LLVM_VERSION:=$(shell $(LLVM_CONFIG) --version | grep "^[3-9].*" >/dev/null 2>&1 && echo yes) @@ -59,14 +60,14 @@ INST_MAN1=sparse.1 cgcc.1 ifeq ($(HAVE_LIBXML),yes) PROGRAMS+=c2xml INST_PROGRAMS+=c2xml -c2xml_EXTRA_OBJS = `pkg-config --libs libxml-2.0` +c2xml_EXTRA_OBJS = `$(PKG_CONFIG) --libs libxml-2.0` else $(warning Your system does not have libxml, disabling c2xml) endif ifeq ($(HAVE_GTK2),yes) -GTK2_CFLAGS := $(shell pkg-config --cflags gtk+-2.0) -GTK2_LIBS := $(shell pkg-config --libs gtk+-2.0) +GTK2_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0) +GTK2_LIBS := $(shell $(PKG_CONFIG) --libs gtk+-2.0) PROGRAMS += test-inspect INST_PROGRAMS += test-inspect test-inspect_EXTRA_DEPS := ast-model.o ast-view.o ast-inspect.o @@ -185,7 +186,7 @@ DEP_FILES := $(wildcard .*.o.d) $(if $(DEP_FILES),$(eval include $(DEP_FILES))) c2xml.o: c2xml.c $(LIB_H) - $(QUIET_CC)$(CC) `pkg-config --cflags libxml-2.0` -o $@ -c $(ALL_CFLAGS) $< + $(QUIET_CC)$(CC) `$(PKG_CONFIG) --cflags libxml-2.0` -o $@ -c $(ALL_CFLAGS) $< compat-linux.o: compat/strtold.c compat/mmap-blob.c $(LIB_H) compat-solaris.o: compat/mmap-blob.c $(LIB_H)