mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Leo Yan <leo.yan@arm.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	James Clark <james.clark@arm.com>,
	Ian Rogers <irogers@google.com>,
	"Liang, Kan" <kan.liang@linux.intel.com>,
	Nick Terrell <terrelln@fb.com>,
	Thomas Richter <tmricht@linux.ibm.com>,
	Changbin Du <changbin.du@huawei.com>,
	Fangrui Song <maskray@google.com>,
	"Mateusz Kowalczyk" <fuuzetsu@fuuzetsu.co.uk>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org
Cc: Leo Yan <leo.yan@arm.com>
Subject: [PATCH v1 1/6] perf: build: Setup PKG_CONFIG_LIBDIR for cross compilation
Date: Tue,  4 Jun 2024 10:32:18 +0100	[thread overview]
Message-ID: <20240604093223.1934236-2-leo.yan@arm.com> (raw)
In-Reply-To: <20240604093223.1934236-1-leo.yan@arm.com>

On recent Linux distros like Ubuntu Noble and Debian Bookworm, the
'pkg-config-aarch64-linux-gnu' package is missing. As a result, the
aarch64-linux-gnu-pkg-config command is not available, which causes
build failures.

Alternatively, this commit sets the PKG_CONFIG_LIBDIR environment
variable dynamically based on the cross compiler to ensure the correct
package configurations.

Signed-off-by: Leo Yan <leo.yan@arm.com>
---
 tools/build/feature/Makefile | 14 +++++++++++++-
 tools/perf/Makefile.perf     | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index ed54cef450f5..6f52f892f9a3 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -82,7 +82,19 @@ FILES=                                          \
 
 FILES := $(addprefix $(OUTPUT),$(FILES))
 
-PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config
+PKG_CONFIG ?= pkg-config
+
+ifdef CROSS_COMPILE
+  ifndef PKG_CONFIG_LIBDIR
+    CROSS_ARCH = $(shell $(CC) -dumpmachine)
+    PKG_CONFIG_LIBDIR := /usr/local/$(CROSS_ARCH)/lib/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/local/share/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/local/lib/$(CROSS_ARCH)/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/lib/$(CROSS_ARCH)/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/share/pkgconfig/
+    export PKG_CONFIG_LIBDIR
+  endif
+endif
 
 all: $(FILES)
 
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 5c35c0d89306..c1553a546a4f 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -193,7 +193,20 @@ HOSTLD  ?= ld
 HOSTAR  ?= ar
 CLANG   ?= clang
 
-PKG_CONFIG = $(CROSS_COMPILE)pkg-config
+PKG_CONFIG ?= pkg-config
+
+# Set the PKG_CONFIG_LIBDIR for cross compilation.
+ifdef CROSS_COMPILE
+  ifndef PKG_CONFIG_LIBDIR
+    CROSS_ARCH = $(shell $(CC) -dumpmachine)
+    PKG_CONFIG_LIBDIR := /usr/local/$(CROSS_ARCH)/lib/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/local/share/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/local/lib/$(CROSS_ARCH)/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/lib/$(CROSS_ARCH)/pkgconfig/
+    PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/share/pkgconfig/
+    export PKG_CONFIG_LIBDIR
+  endif
+endif
 
 RM      = rm -f
 LN      = ln -f
-- 
2.34.1


  reply	other threads:[~2024-06-04  9:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-04  9:32 [PATCH v1 0/6] perf: build: Fix " Leo Yan
2024-06-04  9:32 ` Leo Yan [this message]
2024-06-06 17:28   ` [PATCH v1 1/6] perf: build: Setup PKG_CONFIG_LIBDIR for " Namhyung Kim
2024-06-07 12:50     ` Leo Yan
2024-06-04  9:32 ` [PATCH v1 2/6] perf: build: Append libtraceevent path in PKG_CONFIG_LIBDIR Leo Yan
2024-06-04  9:32 ` [PATCH v1 3/6] perf: build: Set Python configuration for cross compilation Leo Yan
2024-06-04  9:32 ` [PATCH v1 4/6] perf: build: Only link libebl.a for old libdw Leo Yan
2024-06-06 17:40   ` Namhyung Kim
2024-06-07 13:33     ` Leo Yan
2024-06-04  9:32 ` [PATCH v1 5/6] perf: build: Link lib 'lzma' for static build Leo Yan
2024-06-04  9:32 ` [PATCH v1 6/6] perf: build: Link lib 'zstd' " Leo Yan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240604093223.1934236-2-leo.yan@arm.com \
    --to=leo.yan@arm.com \
    --cc=acme@kernel.org \
    --cc=changbin.du@huawei.com \
    --cc=fuuzetsu@fuuzetsu.co.uk \
    --cc=irogers@google.com \
    --cc=james.clark@arm.com \
    --cc=kan.liang@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=maskray@google.com \
    --cc=namhyung@kernel.org \
    --cc=terrelln@fb.com \
    --cc=tmricht@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®