Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/83157?usp=email )
Change subject: tree: Use pkgconf over pkg-config ......................................................................
tree: Use pkgconf over pkg-config
Change-Id: I3e9a92d019854214a5760f705b9cbe3cabe6d2e8 Signed-off-by: Elyes Haouas ehaouas@noos.fr --- M Documentation/tutorial/part1.md M Makefile M payloads/external/GRUB2/Makefile M tests/data/lib/lzma-test/data.2.bin M util/amdfwtool/Makefile.mk M util/cbfstool/lz4/lib/README.md M util/coreboot-configurator/contrib/debian/control M util/futility/Makefile.mk M util/kconfig/mconf-cfg.sh M util/kconfig/nconf-cfg.sh M util/msrtool/configure M util/nixshell/devshell-i386.nix 12 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/83157/1
diff --git a/Documentation/tutorial/part1.md b/Documentation/tutorial/part1.md index 015c75c..9691316 100644 --- a/Documentation/tutorial/part1.md +++ b/Documentation/tutorial/part1.md @@ -30,7 +30,7 @@
Debian based distros: `sudo apt-get install -y bison build-essential curl flex git gnat -libncurses-dev libssl-dev zlib1g-dev pkg-config` +libncurses-dev libssl-dev zlib1g-dev pkgconf`
Arch based distros: `sudo pacman -S base-devel curl git gcc-ada ncurses zlib` @@ -206,7 +206,7 @@ * `m4, bison, curl, flex, zlib1g-dev, gcc, gnat` and `g++` or `clang` are needed to build the coreboot toolchain. `gcc` and `gnat` have to be of the same version. -* `libssl-dev, pkg-config` are needed to build coreboot image (Step 6). +* `libssl-dev, pkgconf` are needed to build coreboot image (Step 6). In particular, `libcrypto` provided by `libssl-dev` package.
If you started with a different distribution or package management diff --git a/Makefile b/Makefile index fddcc5c..e01012b 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ HOSTCFLAGS := -g HOSTCXXFLAGS := -g
-HOSTPKG_CONFIG ?= pkg-config +HOSTPKG_CONFIG ?= pkgconf COREBOOT_EXPORTS += HOSTPKG_CONFIG
PREPROCESS_ONLY := -E -P -x assembler-with-cpp -undef -I . diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile index 4382ae6..0702741 100644 --- a/payloads/external/GRUB2/Makefile +++ b/payloads/external/GRUB2/Makefile @@ -32,7 +32,7 @@ mkdir grub2/build cd grub2 && ./bootstrap ; ./autogen.sh cd grub2/build && ../configure CC="$(HOSTCC)" LD="$(LD)" \ - FREETYPE="pkg-config freetype2" BUILD_FREETYPE="pkg-config freetype2" \ + FREETYPE="pkgconf freetype2" BUILD_FREETYPE="pkgconf freetype2" \ TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" \ CFLAGS=-O2 TARGET_CFLAGS="-Os -fno-reorder-functions" \ --with-platform=coreboot --enable-boot-time --disable-werror diff --git a/tests/data/lib/lzma-test/data.2.bin b/tests/data/lib/lzma-test/data.2.bin index 14879c1..7559391 100644 --- a/tests/data/lib/lzma-test/data.2.bin +++ b/tests/data/lib/lzma-test/data.2.bin @@ -49,7 +49,7 @@ `ANY_TOOLCHAIN` Kconfig option if you're feeling lucky (no support in this case). * iasl (for targets with ACPI support) - * pkg-config + * pkgconf * libssl-dev (openssl)
Optional: diff --git a/util/amdfwtool/Makefile.mk b/util/amdfwtool/Makefile.mk index 0b9cc1b..9e11b95 100644 --- a/util/amdfwtool/Makefile.mk +++ b/util/amdfwtool/Makefile.mk @@ -14,12 +14,12 @@ ifneq ($(PKG_CONFIG),) HOSTPKGCONFIG ?= $(PKG_CONFIG) else -HOSTPKGCONFIG ?= pkg-config +HOSTPKGCONFIG ?= pkgconf endif
AMDFWTOOLCFLAGS += $(shell $(HOSTPKGCONFIG) --cflags libcrypto) ifneq ($(.SHELLSTATUS),0) -$(error "Ensure that pkg-config is installed.") +$(error "Ensure that pkgconf is installed.") endif LDFLAGS += $(shell $(HOSTPKGCONFIG) --libs libcrypto)
diff --git a/util/cbfstool/lz4/lib/README.md b/util/cbfstool/lz4/lib/README.md index f6ebf5e..2d82bc1 100644 --- a/util/cbfstool/lz4/lib/README.md +++ b/util/cbfstool/lz4/lib/README.md @@ -16,6 +16,6 @@
- LICENSE : contains the BSD license text - Makefile : script to compile or install lz4 library (static or dynamic) - - liblz4.pc.in : for pkg-config (make install) + - liblz4.pc.in : for pkgconf (make install)
[official interoperable frame format]: ../lz4_Frame_format.md diff --git a/util/coreboot-configurator/contrib/debian/control b/util/coreboot-configurator/contrib/debian/control index e73e10b..84c21ce 100644 --- a/util/coreboot-configurator/contrib/debian/control +++ b/util/coreboot-configurator/contrib/debian/control @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Star Labs admin@starlabs.systems -Build-Depends: build-essential, cmake, debhelper (>= 7), inkscape, libqt5gui5, libqt5svg5-dev, libyaml-cpp-dev, libqt5gui5, meson, pkg-config, qtbase5-dev, qttools5-dev-tools +Build-Depends: build-essential, cmake, debhelper (>= 7), inkscape, libqt5gui5, libqt5svg5-dev, libyaml-cpp-dev, libqt5gui5, meson, pkgconf, qtbase5-dev, qttools5-dev-tools Standards-Version: 4.1.1
Package: coreboot-configurator diff --git a/util/futility/Makefile.mk b/util/futility/Makefile.mk index a7bcee5..b66572c 100644 --- a/util/futility/Makefile.mk +++ b/util/futility/Makefile.mk @@ -3,7 +3,7 @@
VBOOT_FUTILITY = $(VBOOT_HOST_BUILD)/futility/futility
-HOSTPKGCONFIG ?= pkg-config +HOSTPKGCONFIG ?= pkgconf
$(VBOOT_FUTILITY): | check-openssl-presence @printf " MAKE $(subst $(objutil)/,,$(@))\n" @@ -19,7 +19,7 @@ .PHONY: check-openssl-presence check-openssl-presence: @$(HOSTPKGCONFIG) --exists libcrypto || \ - (echo "Error: Ensure that pkg-config and openssl's libcrypto, including header files, are installed."; exit 1) + (echo "Error: Ensure that pkgconf and openssl's libcrypto, including header files, are installed."; exit 1)
$(objutil)/futility/futility: $(VBOOT_FUTILITY) mkdir -p $(dir $@) diff --git a/util/kconfig/mconf-cfg.sh b/util/kconfig/mconf-cfg.sh index 74c1c27..428dd1e 100755 --- a/util/kconfig/mconf-cfg.sh +++ b/util/kconfig/mconf-cfg.sh @@ -21,9 +21,9 @@ fi fi
-# Check the default paths in case pkg-config is not installed. +# Check the default paths in case pkgconf is not installed. # (Even if it is installed, some distributions such as openSUSE cannot -# find ncurses by pkg-config.) +# find ncurses by pkgconf.) if [ -f /usr/include/ncursesw/ncurses.h ]; then echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags} echo -lncursesw > ${libs} diff --git a/util/kconfig/nconf-cfg.sh b/util/kconfig/nconf-cfg.sh index 9d40960..28c3513 100755 --- a/util/kconfig/nconf-cfg.sh +++ b/util/kconfig/nconf-cfg.sh @@ -21,9 +21,9 @@ fi fi
-# Check the default paths in case pkg-config is not installed. +# Check the default paths in case pkgconf is not installed. # (Even if it is installed, some distributions such as openSUSE cannot -# find ncurses by pkg-config.) +# find ncurses by pkgconf.) if [ -f /usr/include/ncursesw/ncurses.h ]; then echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags} echo -lncursesw -lmenuw -lpanelw > ${libs} diff --git a/util/msrtool/configure b/util/msrtool/configure index 659cbcd..831372e 100755 --- a/util/msrtool/configure +++ b/util/msrtool/configure @@ -142,8 +142,8 @@ { pacc = pci_alloc(); return 0; } EOF
-pc_CFLAGS="`pkg-config libpci --cflags 2>/dev/null`" -pc_LDFLAGS="`pkg-config libpci --libs 2>/dev/null`" +pc_CFLAGS="`pkgconf libpci --cflags 2>/dev/null`" +pc_LDFLAGS="`pkgconf libpci --libs 2>/dev/null`" CFLAGS=`trycompile "libpci (from pciutils)" "${pc_CFLAGS}" "-I/usr/local/include"` || { rm -f .config.c exit 1 diff --git a/util/nixshell/devshell-i386.nix b/util/nixshell/devshell-i386.nix index 88a67dc..14ce025 100644 --- a/util/nixshell/devshell-i386.nix +++ b/util/nixshell/devshell-i386.nix @@ -17,7 +17,7 @@
nativeBuildInputs = [ coreboot-toolchain.i386 - pkg-config + pkgconf openssh ];