mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 18:07:57 +00:00
Code Issues Releases Wiki Activity

build: respect $PKG_CONFIG settings

Browse Source 
The build needs to respect $PKG_CONFIG env var like other standard
build systems and the the upstream pkg-config project itself.  This
allows the package builder to point it to the right tool when doing
a cross-compile build.  Otherwise the host pkg-config tool is used
which won't have access to the packages in the cross sysroot.

Signed-off-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2021-06-16 15:43:04 -04:00 committed by Andrei Vagin
parent 81a68ad3b2
commit 2967bed64e
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.config
View File

@ -30,7 +30,7 @@ else
endif endif
ifeq ($(call pkg-config-check,libnftables),y) ifeq ($(call pkg-config-check,libnftables),y)
LIB_NFTABLES := $(shell pkg-config --libs libnftables) LIB_NFTABLES := $(shell $(PKG_CONFIG) --libs libnftables)
ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true) ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
LIBS_FEATURES += $(LIB_NFTABLES) LIBS_FEATURES += $(LIB_NFTABLES)
FEATURE_DEFINES += -DCONFIG_HAS_NFTABLES_LIB_API_0 FEATURE_DEFINES += -DCONFIG_HAS_NFTABLES_LIB_API_0

2
criu/Makefile
View File

@ -27,7 +27,7 @@ CFLAGS += -iquote include
CFLAGS += -iquote images CFLAGS += -iquote images
CFLAGS += -iquote $(ARCH_DIR)/include CFLAGS += -iquote $(ARCH_DIR)/include
CFLAGS += -iquote . CFLAGS += -iquote .
CFLAGS += $(shell pkg-config --cflags libnl-3.0) CFLAGS += $(shell $(PKG_CONFIG) --cflags libnl-3.0)
CFLAGS += $(CONFIG-DEFINES) CFLAGS += $(CONFIG-DEFINES)
ifeq ($(GMON),1) ifeq ($(GMON),1)

1
scripts/nmk/scripts/tools.mk
View File

@ -17,6 +17,7 @@ AR := $(CROSS_COMPILE)ar
STRIP := $(CROSS_COMPILE)strip STRIP := $(CROSS_COMPILE)strip
OBJCOPY := $(CROSS_COMPILE)objcopy OBJCOPY := $(CROSS_COMPILE)objcopy
OBJDUMP := $(CROSS_COMPILE)objdump OBJDUMP := $(CROSS_COMPILE)objdump
PKG_CONFIG ?= pkg-config
NM := $(CROSS_COMPILE)nm NM := $(CROSS_COMPILE)nm
MAKE := make MAKE := make
MKDIR := mkdir -p MKDIR := mkdir -p

2
scripts/nmk/scripts/utils.mk
View File

@ -16,7 +16,7 @@ try-asm = $(call try-compile,assembler-with-cpp,$(1),$(2),$(3))
# pkg-config-check # pkg-config-check
# Usage: ifeq ($(call pkg-config-check, library),y) # Usage: ifeq ($(call pkg-config-check, library),y)
pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y') pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
# #
# Remove duplicates. # Remove duplicates.

7
test/zdtm/Makefile.inc
View File

@ -37,6 +37,7 @@ HOSTCC ?= gcc
ifeq ($(origin CC), default) ifeq ($(origin CC), default)
CC := $(CROSS_COMPILE)$(HOSTCC) CC := $(CROSS_COMPILE)$(HOSTCC)
endif endif
PKG_CONFIG ?= pkg-config
CFLAGS += -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 CFLAGS += -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
CFLAGS += -Wdeclaration-after-statement -Wstrict-prototypes CFLAGS += -Wdeclaration-after-statement -Wstrict-prototypes
CFLAGS += $(USERCFLAGS) CFLAGS += $(USERCFLAGS)
@ -55,7 +56,7 @@ RM := rm -f --one-file-system
ifeq ($(COMPAT_TEST),y) ifeq ($(COMPAT_TEST),y)
# Firstly look for 32-bit libs and then in standard path. # Firstly look for 32-bit libs and then in standard path.
PKG_CONFIG_PATH := $(shell pkg-config --variable pc_path pkg-config) PKG_CONFIG_PATH := $(shell $(PKG_CONFIG) --variable pc_path pkg-config)
PKG_CONFIG_PATH := /usr/lib32/pkgconfig:$(PKG_CONFIG_PATH) PKG_CONFIG_PATH := /usr/lib32/pkgconfig:$(PKG_CONFIG_PATH)
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
export CFLAGS += -m32 export CFLAGS += -m32
@ -66,11 +67,11 @@ endif
endif endif
define pkg-libs define pkg-libs
$(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --libs $(1)) $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --libs $(1))
endef endef
define pkg-cflags define pkg-cflags
$(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --cflags $(1)) $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --cflags $(1))
endef endef
%.d: %.c %.d: %.c

2
test/zdtm/lib/Makefile
View File

@ -6,7 +6,7 @@ LIB := libzdtmtst.a
LIBSRC := datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c LIBSRC := datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y') pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
ifeq ($(call pkg-config-check,libbpf),y) ifeq ($(call pkg-config-check,libbpf),y)
LIBSRC += bpfmap_zdtm.c LIBSRC += bpfmap_zdtm.c
endif endif

2
test/zdtm/static/Makefile
View File

@ -241,7 +241,7 @@ TST_NOFILE := \
sigtrap01 \ sigtrap01 \
# jobctl00 \ # jobctl00 \
pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y') pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
ifeq ($(call pkg-config-check,libbpf),y) ifeq ($(call pkg-config-check,libbpf),y)
TST_NOFILE += \ TST_NOFILE += \
bpf_hash \ bpf_hash \