Commit Graph

6 Commits

Author SHA1 Message Date
Peter Bergin
0e32e1cb26 pkg-config-native,librsvg-native: fix EXTRA_NATIVE_PKGCONFIG_PATH
When building librsvg-native the variable PKG_CONFIG_PATH
was incorrect in the bitbake environment but handled correct due
to the pkg-config-native wrapper. Commit [1] and [2]
introduced some inconsistens of EXTRA_NATIVE_PKGCONFIG_PATH
where it was prepended in pkg-config-native wrappers but
appended in native.bbclass.

  meta/classes-recipe/native.bbclass:
    PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"

This commit will try to resolve this to always append the
EXTRA_NATIVE_PKGCONFIG_PATH. It is tested by building
librsvg-native and also checking bitbake environment
before and after.

[1] https://git.openembedded.org/openembedded-core/commit?id=2bc050146d47b14d890a1b0db2b55f9057a08b65
[2] https://git.openembedded.org/openembedded-core/commit?id=ae4824f4f6234884a245bce314d6305ad8eb982d

(From OE-Core rev: a59fa4a4bf08bbbd79fbb1642b3e3b23181f87c9)

Signed-off-by: Peter Bergin <peter@berginkonsult.se>
Cc: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2025-03-20 11:29:04 +00:00
Alexander Kanavin
c6557ce953 pkg-config-native: pick additional search paths from $EXTRA_NATIVE_PKGCONFIG_PATH
This was prompted by working on librsvg update: the new meson-driven
version wants to query values from .pc files residing in its own
build directory, and modifies PKG_CONFIG_PATH accordingly.

When using the pkg-config-native wrapper such modifications
have no effect, and we have to pass them in manually
from the recipe via EXTRA_NATIVE_PKGCONFIG_PATH variable.

This variable is already defined (with an empty value) and
appended to PKG_CONFIG_PATH export in the native class, so this
simply extends its use to the wrapper.

(Appending to PKG_CONFIG_PATH in the wrapper, instead of resetting it,
is not an option as that can lead to contamination with the cross values).

(From OE-Core rev: 2bc050146d47b14d890a1b0db2b55f9057a08b65)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-12-05 17:07:10 +00:00
Maxin B. John
8557475e37 pkgconf: revert changes to pkg-config-wrapper
To maintain the status quo, revert changes to pkgconf wrappers.
This helps to keep it compatible with freedesktop.org pkg-config.

(From OE-Core rev: 8ee8eb8a15e0e4a652df3fe77805d9cffa02ed22)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-04 11:35:40 +00:00
Maxin B. John
6c0c3220aa pkgconf: upgrade to version 1.4.2
pkgconf improved compatibility with freedesktop.org pkg-config.
So, we don't need to unset PKG_CONFIG_SYSROOT_DIR in wrappers.

(From OE-Core rev: bff4ad7d6f62131a9b91a4063600e6f3edb8843c)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-02-24 10:31:46 +00:00
Maxin B. John
9b7a842855 pkgconf: upgrade to 1.4.0
1.3.7 -> 1.4.0

Removed following upstreamed and backported patches:
        1. 0001-stdinc.h-fix-build-with-mingw.patch
        2. 0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch

Change in checksum is due to bump in copyrights to 2018.

(From OE-Core rev: 85e215ca46d8d413c000f0e0675840ab460e4a5b)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-01-19 12:37:13 +00:00
Maxin B. John
ee8b56528d pkgconf: add recipe
pkgconf is a better replacement for pkg-config. Fedora 26 replaces the
system pkg-config implementation with pkgconf because it "provides better
support for handling .pc files and a stable library ABI/API for integrating
into applications." and is actively maintained, unlike pkg-config.

pkgconf aims to offer many improvements over pkg-config such as faster/more
efficient dependency resolver which "allows for the user to more conservatively
link their binaries -- which may be helpful in some environments, such as when
prelink(1) is being used.

pkgconf also aims to provide a more complete implementation of pkg-config.
The features most likely to benefit the Yocto Project build system are the
faster/more efficient dependency resolution and linker flag optimisation.

Move pkgconf recipe to oe-core from meta-pkgconf:
https://github.com/kergoth/meta-kergoth-wip/tree/master/meta-pkgconf

Links:
1. http://pkgconf.org
2. https://fedoraproject.org/wiki/Changes/pkgconf_as_system_pkg-config_implementation
3. https://bugzilla.yoctoproject.org/show_bug.cgi?id=11308

(From OE-Core rev: 879bd0ff00ebebfdeef52c3f61597d635e040aef)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-23 12:06:51 +01:00