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.1Hi Leo, On Tue, Jun 04, 2024 at 10:32:18AM +0100, Leo Yan wrote: > 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 Can we do that only if the cross-compile-pkg-config is not available? Thanks, Namhyung > + 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 >
Hi Namhyung, On 6/6/24 18:28, Namhyung Kim wrote: >> --- 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 > > Can we do that only if the cross-compile-pkg-config is not available? Makes sense for me. I will update for this. Thanks, Leo
© 2016 - 2026 Red Hat, Inc.