Skip to contentSkip to conversation

replace freedesktop.org pkg-config with pkgconf

PATCH In review Maxin B. John 4 participants 36 messages Feb 19, 2018 – Feb 26, 2018 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover replace freedesktop.org pkg-config with pkgconf

Reasons behind this patch set:

1. pkgconf is actively maintained
2. pkgconf has better cross-compiling support (According to the author of pkgconf, it was created as he got tired of patching .pc files to add ${pc_sysrootdir})
3. oe-core can drop a number of work-around patches that deals with pkg-config

pkgconf and freedesktop.org pkg-config intentionally have different behaviour for cross-compile. So, when we use paths relative to inside the sysroot for installation, pkgconf could break build.

example scenario where pkgconf could break build:

UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null) $(INSTALL) -D -m 644 test.rules $(DESTDIR)$(UDEVDIR)/rules.d/test.rules

here, freedesktop.org pkg-config, UDEVDIR can be:
"/usr/lib/udev"
For pkgconf, UDEVDIR can be:
"<path-to-build-dir>/tmp/work/i586-poky-linux/bluez5/5.48-r0/recipe-sysroot/lib/udev"

The right thing (TM) to do in this situation is to provide a configuration option to override those paths. Otherwise, we can prepend "unset PKG_CONFIG_SYSROOT_DIR" or "PKG_CONFIG_SYSROOT_DIR='/'" to get the relative path.

We could move the freedesktop.org pkg-config recipe to meta-oe.

[YOCTO #11308]

Maxin B. John (27):
pkgconf: upgrade to version 1.4.2
default-providers.inc: set pkgconf as default pkg-config provider
pkgconfig: remove from oe-core
webkitgtk: remove PKG_CONFIG_SYSROOT_DIR work-around gstreamer1.0: remove PKG_CONFIG_SYSROOT_DIR work-around gstreamer1.0-plugins-base: remove PKG_CONFIG_SYSROOT_DIR work-around
libxcb: remove PKG_CONFIG_SYSROOT_DIR work-around
meson: remove PKG_CONFIG_SYSROOT_DIR work-around
libdnf: remove PKG_CONFIG_SYSROOT_DIR work-around
vala: remove PKG_CONFIG_SYSROOT_DIR work-around
gobject-introspection: remove PKG_CONFIG_SYSROOT_DIR work-around
kmod: define bashcompletiondir
util-linux: define bashcompletiondir
systemd: define bashcompletiondir
libinput: fix udev path for pkgconf
pulseaudio: fix udev path for pkgconf
alsa-utils: fix udev path for pkgconf
ofono: specify dbusconfdir
connman: specify dbusconfdir
bluez5: specify udev, dbus and systemd configurations
xf86-input-synaptics: fix installation paths
xf86-input-mouse: fix header-file installation path
xf86-input-libinput: fix header-file installation path
xf86-input-evdev: fix header-file installation path
glib-networking: unset PKG_CONFIG_SYSROOT_DIR for relative path
btrfs-tools: unset PKG_CONFIG_SYSROOT_DIR for relative path
librsvg: unset PKG_CONFIG_SYSROOT_DIR for relative path

 meta/conf/distro/include/default-providers.inc     |   6 +-
 meta/recipes-connectivity/bluez5/bluez5.inc        |   8 +-
 meta/recipes-connectivity/connman/connman.inc      |   1 +
 meta/recipes-connectivity/ofono/ofono.inc          |   2 +-
 ...c-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch |  31 +++
 .../glib-networking/glib-networking_2.54.1.bb      |   2 +
 meta/recipes-core/systemd/systemd_234.bb           |   1 +
 meta/recipes-core/util-linux/util-linux.inc        |   1 +
 ...c-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch |  31 +++
 .../btrfs-tools/btrfs-tools_4.13.3.bb              |   1 +
 ...-sysroot-path-to-introspection-tools-path.patch |  36 ---
 meta/recipes-devtools/libdnf/libdnf_0.11.1.bb      |   1 -
 ...rospection-determine-g-ir-scanner-and-g-i.patch |   4 +-
 .../pkgconf/pkgconf/pkg-config-esdk.in             |   4 +-
 .../pkgconf/pkgconf/pkg-config-native.in           |   1 -
 .../pkgconf/pkgconf/pkg-config-wrapper             |   9 -
 .../pkgconf/{pkgconf_1.4.0.bb => pkgconf_1.4.2.bb} |   4 +-
 ...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch |  41 ---
 .../fix-glib-configure-libtool-usage.patch         |  45 ----
 .../pkgconfig/pkgconfig/pkg-config-esdk.in         |  24 --
 .../pkgconfig/pkgconfig/pkg-config-native.in       |   7 -
 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb   |  73 -----
 ...001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch |  38 ---
 meta/recipes-devtools/vala/vala_0.38.6.bb          |   1 -
 ...config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch |  96 -------
 .../gobject-introspection_1.54.1.bb                |   1 -
 .../0001-configure.ac-fix-build-with-pkgconf.patch |  32 +++
 meta/recipes-gnome/librsvg/librsvg_2.40.20.bb      |   4 +-
 meta/recipes-graphics/wayland/libinput_1.9.4.bb    |   2 +-
 .../xorg-driver/xf86-input-evdev_2.10.5.bb         |   1 +
 .../xorg-driver/xf86-input-libinput_0.26.0.bb      |   2 +
 .../xorg-driver/xf86-input-mouse_1.9.2.bb          |   2 +
 .../xorg-driver/xf86-input-synaptics_1.9.0.bb      |   2 +
 .../xorg-lib/libxcb/xcbincludedir.patch            |  28 --
 meta/recipes-graphics/xorg-lib/libxcb_1.12.bb      |   1 -
 meta/recipes-kernel/kmod/kmod_git.bb               |   2 +
 meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb   |   5 +-
 ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch |  42 ---
 .../gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb   |   1 -
 .../gstreamer/gstreamer1.0-plugins-base.inc        |   1 -
 ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 298 ---------------------
 .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb  |   1 -
 .../gstreamer/gstreamer1.0-plugins-good_1.12.4.bb  |   1 -
 .../gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb  |   1 -
 .../gstreamer/gstreamer1.0-rtsp-server.inc         |   1 -
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc |   1 -
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |   2 +-
 ...Introspection.cmake-prefix-variables-obta.patch |  27 --
 meta/recipes-sato/webkit/webkitgtk_2.18.6.bb       |   1 -
 49 files changed, 132 insertions(+), 795 deletions(-)
 create mode 100644 meta/recipes-core/glib-networking/glib-networking/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch
 delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch
 rename meta/recipes-devtools/pkgconf/{pkgconf_1.4.0.bb => pkgconf_1.4.2.bb} (95%)
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
 delete mode 100644 meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
 delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
 create mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-configure.ac-fix-build-with-pkgconf.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
Signature · 1 line
2.4.0
#1 lore raw

PATCH 1/27 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.

---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in         | 4 +---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in       | 1 -
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper         | 9 ---------
 .../pkgconf/{pkgconf_1.4.0.bb => pkgconf_1.4.2.bb}               | 4 ++--
 4 files changed, 3 insertions(+), 15 deletions(-)
 rename meta/recipes-devtools/pkgconf/{pkgconf_1.4.0.bb => pkgconf_1.4.2.bb} (95%)
meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in +1 -3
index 4fc9b0a..d4ac71d 100644
@@ -5,7 +5,6 @@
 if [ "pkg-config-native" = "`basename $0`" ] ; then
 	PKG_CONFIG_PATH="@PATH_NATIVE@"
 	PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-	unset PKG_CONFIG_SYSROOT_DIR
 else
 	# in this case check if we are in the esdk
 	if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then
@@ -16,9 +15,8 @@ else
 		if ( echo $parentpid_info | grep -q check-lxdialog ) ; then
 			PKG_CONFIG_PATH="@PATH_NATIVE@"
 			PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-			unset PKG_CONFIG_SYSROOT_DIR
 		fi
 	fi
 fi
 
-pkg-config.real "$@"
+pkg-config "$@"
meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in +0 -1
index 9ed30a0..c2e86e5 100644
@@ -1,6 +1,5 @@
 #! /bin/sh
 
 PKG_CONFIG_PATH="@PATH_NATIVE@"
-unset PKG_CONFIG_SYSROOT_DIR
 
 pkg-config "$@"
meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper +0 -9
index 695f349..fc9b488 100755
@@ -4,13 +4,4 @@
 # Copyright (C) 2015 Christopher Larson <[email protected]>
 # License: MIT (see COPYING.MIT at the root of the repository for terms)
 
-for arg; do
-    case "$arg" in
-        --variable|--variable=*)
-            # pkg-config doesn't sysroot-prefix user variables
-            unset PKG_CONFIG_SYSROOT_DIR
-            ;;
-    esac
-done
-
 exec pkgconf "$@"
meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb renamed from meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb +2 -2
similarity index 95%
rename from meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb
rename to meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb
index 48ba598..ea7b666 100644
@@ -21,8 +21,8 @@ SRC_URI = "\
     file://pkg-config-native.in \
     file://pkg-config-esdk.in \
 "
-SRC_URI[md5sum] = "c509c0dad5a70aa4bc3210557b7eafce"
-SRC_URI[sha256sum] = "1d112ff35dad516ffbfbdb013df3a035140618fe7632ec44ffa894a9c713301b"
+SRC_URI[md5sum] = "678d242b4eef1754bba6a58642af10bb"
+SRC_URI[sha256sum] = "bab39371d4ab972be1d539a8b10b6cc21f8eafc97f617102e667e82bd32eb234"
 
 inherit autotools update-alternatives
 
Signature · 1 line
2.4.0
#2 lore raw

Re: [PATCH 01/27] pkgconf: upgrade to version 1.4.2

This is regressing kmod builds

ERROR: kmod-25+gitAUTOINC+aca4eca103-r0 do_package: QA Issue: kmod:
Files/directories were installed but not shipped in any pack age:

/mnt/a/oe-build/build/tmp/work/aarch64-bec-linux/kmod/25+gitAUTOINC+aca4eca103-r0/recipe-sysroot/usr/share/bash-completion/completions/kmod

as you can see its stll carrying the sysroot prefix into DESTDIR

and this is how kmod is asserting for bash-completion dir

with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)

it was working fine with 1.4.0

Quoted 90 lines · Maxin B. John

pkgconf improved compatibility with freedesktop.org pkg-config. So, we don't need to unset PKG_CONFIG_SYSROOT_DIR in wrappers.

---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in         | 4 +---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in       | 1 -
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper         | 9 ---------
 .../pkgconf/{pkgconf_1.4.0.bb => pkgconf_1.4.2.bb}               | 4 ++--
 4 files changed, 3 insertions(+), 15 deletions(-)
 rename meta/recipes-devtools/pkgconf/{pkgconf_1.4.0.bb => pkgconf_1.4.2.bb} (95%)
meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in +1 -3
index 4fc9b0a..d4ac71d 100644
@@ -5,7 +5,6 @@
 if [ "pkg-config-native" = "`basename $0`" ] ; then
        PKG_CONFIG_PATH="@PATH_NATIVE@"
        PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-       unset PKG_CONFIG_SYSROOT_DIR
 else
        # in this case check if we are in the esdk
        if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then
@@ -16,9 +15,8 @@ else
                if ( echo $parentpid_info | grep -q check-lxdialog ) ; then
                        PKG_CONFIG_PATH="@PATH_NATIVE@"
                        PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-                       unset PKG_CONFIG_SYSROOT_DIR
                fi
        fi
 fi
 
-pkg-config.real "$@"
+pkg-config "$@"
meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in +0 -1
index 9ed30a0..c2e86e5 100644
@@ -1,6 +1,5 @@
 #! /bin/sh
 
 PKG_CONFIG_PATH="@PATH_NATIVE@"
-unset PKG_CONFIG_SYSROOT_DIR
 
 pkg-config "$@"
meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper +0 -9
index 695f349..fc9b488 100755
@@ -4,13 +4,4 @@
 # Copyright (C) 2015 Christopher Larson <[email protected]>
 # License: MIT (see COPYING.MIT at the root of the repository for terms)
 
-for arg; do
-    case "$arg" in
-        --variable|--variable=*)
-            # pkg-config doesn't sysroot-prefix user variables
-            unset PKG_CONFIG_SYSROOT_DIR
-            ;;
-    esac
-done
-
 exec pkgconf "$@"
meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb renamed from meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb +2 -3
similarity index 95%
rename from meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb
rename to meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb
index 48ba598..ea7b666 100644
@@ -21,8 +21,8 @@ SRC_URI = "\
     file://pkg-config-native.in \
     file://pkg-config-esdk.in \
 "
-SRC_URI[md5sum] = "c509c0dad5a70aa4bc3210557b7eafce"
-SRC_URI[sha256sum] = "1d112ff35dad516ffbfbdb013df3a035140618fe7632ec44ffa894a9c713301b"
+SRC_URI[md5sum] = "678d242b4eef1754bba6a58642af10bb"
+SRC_URI[sha256sum] = "bab39371d4ab972be1d539a8b10b6cc21f8eafc97f617102e667e82bd32eb234"
 
 inherit autotools update-alternatives
 
--

2.4.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw

Re: [PATCH 01/27] pkgconf: upgrade to version 1.4.2

Hi Khem,

Quoted 8 lines · Khem Raj

This is regressing kmod builds

ERROR: kmod-25+gitAUTOINC+aca4eca103-r0 do_package: QA Issue: kmod:
Files/directories were installed but not shipped in any pack age:

/mnt/a/oe-build/build/tmp/work/aarch64-bec-linux/kmod/25+gitAUTOINC+aca4eca103-r0/recipe-sysroot/usr/share/bash-completion/completions/kmod

Quoted 7 lines

as you can see its stll carrying the sysroot prefix into DESTDIR

and this is how kmod is asserting for bash-completion dir

with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)

it was working fine with 1.4.0

Good catch. This patch has removed the work-around that we had to make pkgconf build compatible with freedesktop.org's pkg-conf in wrappers like:

Quoted 1 line
Quoted 1 line

- unset PKG_CONFIG_SYSROOT_DIR

Without the associated kmod fix, this will fail as above. I will revert those wrapper changes till we decide to go with pkgconf or not.

Quoted 8 lines · Maxin B. John
Quoted 7 lines

pkgconf improved compatibility with freedesktop.org pkg-config. So, we don't need to unset PKG_CONFIG_SYSROOT_DIR in wrappers.

---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in         | 4 +---

- unset PKG_CONFIG_SYSROOT_DIR

Best Regards,
Maxin

#4 lore raw

Re: [PATCH 01/27] pkgconf: upgrade to version 1.4.2

Whoops, I thought the upgrade was safe without the rest of the series.

Khem, are you using pkgconf instead of pkg-config then?

Ross

Quoted 49 lines · Maxin B. John

Hi Khem,

Quoted 7 lines · Khem Raj

This is regressing kmod builds

ERROR: kmod-25+gitAUTOINC+aca4eca103-r0 do_package: QA Issue: kmod:
Files/directories were installed but not shipped in any pack age:

/mnt/a/oe-build/build/tmp/work/aarch64-bec-linux/kmod/

25+gitAUTOINC+aca4eca103-r0/recipe-sysroot/usr/share/bash- completion/completions/kmod

Quoted 6 lines

as you can see its stll carrying the sysroot prefix into DESTDIR

and this is how kmod is asserting for bash-completion dir

with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir

bash-completion)

Quoted 2 lines

it was working fine with 1.4.0

Good catch. This patch has removed the work-around that we had to make pkgconf build compatible with freedesktop.org's pkg-conf in wrappers like:

Quoted 1 line
Quoted 1 line

- unset PKG_CONFIG_SYSROOT_DIR

Without the associated kmod fix, this will fail as above. I will revert those wrapper changes till we decide to go with pkgconf or not.

Quoted 1 line

On Mon, Feb 19, 2018 at 12:36 AM, Maxin B. John <[email protected]>

Quoted 6 lines · wrote:
Quoted 6 lines

pkgconf improved compatibility with freedesktop.org pkg-config. So, we don't need to unset PKG_CONFIG_SYSROOT_DIR in wrappers.

---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in         | 4
+---
> > -            unset PKG_CONFIG_SYSROOT_DIR

Best Regards,
Maxin
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw

Re: [PATCH 01/27] pkgconf: upgrade to version 1.4.2

Quoted 4 lines · Ross

Whoops, I thought the upgrade was safe without the rest of the series.

Khem, are you using pkgconf instead of pkg-config then?

yes I am trying to and so far it has held up.

Quoted 53 lines

Ross

Quoted 48 lines · Maxin B. John

Hi Khem,

Quoted 9 lines · Khem Raj

This is regressing kmod builds

ERROR: kmod-25+gitAUTOINC+aca4eca103-r0 do_package: QA Issue: kmod:
Files/directories were installed but not shipped in any pack age:

/mnt/a/oe-build/build/tmp/work/aarch64-bec-linux/kmod/25+gitAUTOINC+aca4eca103-r0/recipe-sysroot/usr/share/bash-completion/completions/kmod

Quoted 8 lines

as you can see its stll carrying the sysroot prefix into DESTDIR

and this is how kmod is asserting for bash-completion dir

with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)

it was working fine with 1.4.0

Good catch. This patch has removed the work-around that we had to make pkgconf build compatible with freedesktop.org's pkg-conf in wrappers like:

Quoted 1 line
Quoted 1 line

- unset PKG_CONFIG_SYSROOT_DIR

Without the associated kmod fix, this will fail as above. I will revert those wrapper changes till we decide to go with pkgconf or not.

Quoted 10 lines
Quoted 8 lines · Maxin B. John

pkgconf improved compatibility with freedesktop.org pkg-config. So, we don't need to unset PKG_CONFIG_SYSROOT_DIR in wrappers.

---
 meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in         | 4
+---
-            unset PKG_CONFIG_SYSROOT_DIR

Best Regards,
Maxin
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw

PATCH 2/27 default-providers.inc: set pkgconf as default pkg-config provider

In reply to Maxin B. John

Move from freedesktop.org's pkg-config to pkgconf

---
 meta/conf/distro/include/default-providers.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/conf/distro/include/default-providers.inc +3 -3
index e65c1ed..95a7dfc 100644
@@ -50,7 +50,7 @@ PREFERRED_PROVIDER_getopt ?= "util-linux-getopt"
 PREFERRED_PROVIDER_openssl ?= "openssl"
 PREFERRED_PROVIDER_openssl-native ?= "openssl-native"
 PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl"
-PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig"
-PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig"
-PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native"
+PREFERRED_PROVIDER_pkgconfig ?= "pkgconf"
+PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconf"
+PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconf-native"
 PREFERRED_RPROVIDER_initd-functions ?= "initscripts"
Signature · 1 line
2.4.0
#7 lore raw

PATCH 3/27 pkgconfig: remove from oe-core

In reply to Maxin B. John

Move freedesktop.org's pkg-config as we are replacing it with pkgconf

---
 ...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 41 ------------
 .../fix-glib-configure-libtool-usage.patch         | 45 -------------
 .../pkgconfig/pkgconfig/pkg-config-esdk.in         | 24 -------
 .../pkgconfig/pkgconfig/pkg-config-native.in       |  7 ---
 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb   | 73 ----------------------
 5 files changed, 190 deletions(-)
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
 delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch deleted +0 -41
deleted file mode 100644
index 80310cd..0000000
@@ -1,41 +0,0 @@
-From e404e27de77d8b993c4cc87013d707200b3a5547 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-Date: Tue, 17 May 2016 13:26:27 +0300
-Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib
-
-This avoids
-  error: m4_copy: won't overwrite defined macro: glib_DEFUN
-
-Signed-off-by: Jussi Kukkonen <[email protected]>
-Upstream-Status: Pending
-
----
- glib/m4macros/glib-gettext.m4 | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/glib/m4macros/glib-gettext.m4 b/glib/m4macros/glib-gettext.m4
-index 5217fd8..155b1d8 100644
---- a/glib/m4macros/glib-gettext.m4
-+++ b/glib/m4macros/glib-gettext.m4
-@@ -313,7 +313,7 @@ msgstr ""
- # on various variables needed by the Makefile.in.in installed by 
- # glib-gettextize.
- dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-+AU_DEFUN([GLIB_GNU_GETTEXT],
-   [AC_REQUIRE([AC_PROG_CC])dnl
-    
-    GLIB_LC_MESSAGES
-@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
-    rm -f po/POTFILES
-    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- 	< $srcdir/po/POTFILES.in > po/POTFILES
--  ])
-+  ],
-+  [[$0: This macro is deprecated. You should use upstream gettext instead.]])
- 
- # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
- # -------------------------------
--- 
-2.1.4
-
meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in deleted +0 -24
deleted file mode 100644
index 4fc9b0a..0000000
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# Orignal pkg-config-native action when called as pkg-config-native
-# NO Change here
-if [ "pkg-config-native" = "`basename $0`" ] ; then
-	PKG_CONFIG_PATH="@PATH_NATIVE@"
-	PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-	unset PKG_CONFIG_SYSROOT_DIR
-else
-	# in this case check if we are in the esdk
-	if [ "$OE_SKIP_SDK_CHECK" = "1" ] ; then
-		parentpid=`ps -o ppid= -p $$`
-		parentpid_info=`ps -wo comm= -o args= -p $parentpid`
-
-		# check if we are being called from  the kernel's make menuconfig
-		if ( echo $parentpid_info | grep -q check-lxdialog ) ; then
-			PKG_CONFIG_PATH="@PATH_NATIVE@"
-			PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-			unset PKG_CONFIG_SYSROOT_DIR
-		fi
-	fi
-fi
-
-pkg-config.real "$@"
meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in deleted +0 -7
deleted file mode 100644
index 5e44bb4..0000000
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-PKG_CONFIG_PATH="@PATH_NATIVE@"
-PKG_CONFIG_LIBDIR="@LIBDIR_NATIVE@"
-unset PKG_CONFIG_SYSROOT_DIR
-
-pkg-config "$@"
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb deleted +0 -73

73 lines not on this page · raw message

Signature · 1 line
2.4.0
#8 lore raw

PATCH 4/27 webkitgtk: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This enables us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1. 0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch

---
 ...Introspection.cmake-prefix-variables-obta.patch | 27 ----------------------
 meta/recipes-sato/webkit/webkitgtk_2.18.6.bb       |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch deleted +0 -27
deleted file mode 100644
index fae3b0b..0000000
@@ -1,27 +0,0 @@
-From 317a5ac120c44987219bc03486cd2f2d1842c9b9 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 27 Oct 2015 16:02:19 +0200
-Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
- from pkg-config with PKG_CONFIG_SYSROOT_DIR
-
-Upstream-Status: Pending [review on oe-core list]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- Source/cmake/FindGObjectIntrospection.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/cmake/FindGObjectIntrospection.cmake b/Source/cmake/FindGObjectIntrospection.cmake
-index e1f49b4..03a4446 100644
---- a/Source/cmake/FindGObjectIntrospection.cmake
-+++ b/Source/cmake/FindGObjectIntrospection.cmake
-@@ -26,6 +26,7 @@ macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname _extra_args)
-     else ()
-         string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
-         string(REGEX REPLACE " +$" ""  _result "${_result}")
-+        string(CONCAT _result $ENV{PKG_CONFIG_SYSROOT_DIR} "${_result}")
-         separate_arguments(_result)
-         set(${_outvar} ${_result} CACHE INTERNAL "")
-     endif ()
--- 
-2.1.4
-
meta/recipes-sato/webkit/webkitgtk_2.18.6.bb +0 -1
index ff0ff8f..f88306c 100644
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842
 		   "
 
 SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
-           file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
            file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
            file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
            file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
Signature · 1 line
2.4.0
#9 lore raw

PATCH 5/27 gstreamer1.0: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This enables us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1) 0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch

---
 ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 42 ----------------------
 .../gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb   |  1 -
 .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb  |  1 -
 .../gstreamer/gstreamer1.0-plugins-good_1.12.4.bb  |  1 -
 .../gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb  |  1 -
 .../gstreamer/gstreamer1.0-rtsp-server.inc         |  1 -
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc |  1 -
 7 files changed, 48 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch deleted +0 -42
deleted file mode 100644
index 2cab87f..0000000
@@ -1,42 +0,0 @@
-From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 24 Nov 2015 16:46:27 +0200
-Subject: [PATCH] introspection.m4: prefix pkgconfig paths with
- PKG_CONFIG_SYSROOT_DIR
-
-We can't use our tweaked introspection.m4 from gobject-introspection tarball
-because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which
-is later supplied to g-ir-scanner.
-
-Upstream-Status: Pending [review on oe-core list]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- common/m4/introspection.m4 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4
-index 162be57..217a6ae 100644
---- a/common/m4/introspection.m4
-+++ b/common/m4/introspection.m4
-@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-     INTROSPECTION_GIRDIR=
-     INTROSPECTION_TYPELIBDIR=
-     if test "x$found_introspection" = "xyes"; then
--       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
--       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
--       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+       INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+       INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+       INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
--       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-+       INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-        INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);"
-     fi
-     AC_SUBST(INTROSPECTION_SCANNER)
--- 
-2.6.2
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb +0 -1
index 82c7ffc..f341d3e 100644
@@ -11,7 +11,6 @@ SRC_URI = " \
     file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
     file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
     file://0009-glimagesink-Downrank-to-marginal.patch \
-    file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://link-with-libvchostif.patch \
     file://0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch \
     file://0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch \
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb +0 -1
index dd895bb..84f6292 100644
@@ -10,7 +10,6 @@ SRC_URI = " \
     file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
     file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \
     file://make-gio_unix_2_0-dependency-configurable.patch \
-    file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
 "
 SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131"
 SRC_URI[sha256sum] = "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb +0 -1
index a060964..efcdd69 100644
@@ -9,7 +9,6 @@ SRC_URI = " \
     file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \
     file://avoid-including-sys-poll.h-directly.patch \
     file://ensure-valid-sentinel-for-gst_structure_get.patch \
-    file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
 "
 SRC_URI[md5sum] = "bdf4791a2b788ec6a149b81ff4032038"
 SRC_URI[sha256sum] = "649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb +0 -1
index f833351..45912b9 100644
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 SRC_URI = " \
     http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
-    file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
 "
 SRC_URI[md5sum] = "e2b836fb2747f6ae3a1a6f33a9d8c952"
 SRC_URI[sha256sum] = "1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522"
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc +0 -1
index 70e90b8..1c373f7 100644
@@ -9,7 +9,6 @@ PNREAL = "gst-rtsp-server"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
            file://0001-Don-t-hardcode-libtool-name-when-using-introspection.patch \
-           file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
            file://gtk-doc-tweaks.patch"
 
 S = "${WORKDIR}/${PNREAL}-${PV}"
meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +0 -1
index c2df1f3..8f1c18b 100644
@@ -15,7 +15,6 @@ inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspecti
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
 SRC_URI_append = " \
-    file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://gtk-doc-tweaks.patch \
     file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
 "
Signature · 1 line
2.4.0
#10 lore raw

PATCH 6/27 gstreamer1.0-plugins-base: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This enables us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1) 0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch

---
 .../gstreamer/gstreamer1.0-plugins-base.inc        |   1 -
 ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 298 ---------------------
 2 files changed, 299 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +0 -1
index 08130c1..0d0a83b 100644
@@ -2,7 +2,6 @@ require gstreamer1.0-plugins.inc
 
 SRC_URI_append = "\
     file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
-    file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
     file://0003-riff-add-missing-include-directories-when-calling-in.patch \
     file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
 "
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch deleted +0 -298

298 lines not on this page · raw message

Signature · 1 line
2.4.0
#11 lore raw

PATCH 7/27 libxcb: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This enables us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1) xcbincludedir.patch

---
 .../xorg-lib/libxcb/xcbincludedir.patch            | 28 ----------------------
 meta/recipes-graphics/xorg-lib/libxcb_1.12.bb      |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch deleted +0 -28
deleted file mode 100644
index 46297c3..0000000
@@ -1,28 +0,0 @@
-As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot
-to the beginning of variables that are used later on the host.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/configure.ac b/configure.ac
-index 94da4f7..d29cd6a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,7 +64,7 @@ AC_SUBST(NEEDED)
- 
- # Find the xcb-proto protocol descriptions
- AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
--XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
-+XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
- AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
- AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
- 
-@@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION)
- 
- # Find the xcbgen Python package
- AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR)
--XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
-+XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto`
- AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
- AC_SUBST(XCBPROTO_XCBPYTHONDIR)
- 
meta/recipes-graphics/xorg-lib/libxcb_1.12.bb +0 -1
index a38bdea..e1c461e 100644
@@ -10,7 +10,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
-           file://xcbincludedir.patch \
            file://disable-check.patch \
            file://gcc-mips-pr68302-mips-workaround.patch \
            file://Fix-inconsistent-use-of-tabs-vs.-space.patch \
Signature · 1 line
2.4.0
#12 lore raw

PATCH 8/27 meson: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This helps us to update the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1) 0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch

---
 .../0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch +2 -2
index ded42d1..440f637 100644
@@ -32,8 +32,8 @@ index 4f7fe30..9610cf6 100644
                  self.gir_dep = PkgConfigDependency('gobject-introspection-1.0',
                                                     state.environment,
                                                     {'native': True})
-+            giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
-+            gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
++            giscanner =  self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {})
++            gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
              pkgargs = self.gir_dep.get_compile_args()
          except Exception:
              raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.')
Signature · 1 line
2.4.0
#13 lore raw

PATCH 9/27 libdnf: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This helps us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1) 0002-Prefix-sysroot-path-to-introspection-tools-path.patch

---
 ...-sysroot-path-to-introspection-tools-path.patch | 36 ----------------------
 meta/recipes-devtools/libdnf/libdnf_0.11.1.bb      |  1 -
 2 files changed, 37 deletions(-)
 delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch
meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch deleted +0 -36
deleted file mode 100644
index 7eecc3d..0000000
@@ -1,36 +0,0 @@
-From c8211ad99ccaa4af4a75e0ba639527267fcfd69e Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 30 Dec 2016 18:17:19 +0200
-Subject: [PATCH 2/4] Prefix sysroot path to introspection tools path.
-
-Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- libdnf/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdnf/CMakeLists.txt b/libdnf/CMakeLists.txt
-index 63f07bf..837792b 100644
---- a/libdnf/CMakeLists.txt
-+++ b/libdnf/CMakeLists.txt
-@@ -133,7 +133,7 @@ if (GOBJECT_INTROSPECTION_FOUND)
-         set(GIR_TYPELIB "${GIR_PREFIX}.typelib")
- 
-         add_custom_command(OUTPUT ${GIR_XML}
--            COMMAND env CFLAGS=${CMAKE_C_FLAGS} ${GOBJECT_INTROSPECTION_1.0_G_IR_SCANNER}
-+            COMMAND env CFLAGS=${CMAKE_C_FLAGS} $ENV{PKG_CONFIG_SYSROOT_DIR}${GOBJECT_INTROSPECTION_1.0_G_IR_SCANNER}
-                     --namespace=Dnf
-                     --nsversion=${DNF_SO_VERSION}.0
-                     --library-path=${CMAKE_CURRENT_BINARY_DIR}
-@@ -153,7 +153,7 @@ if (GOBJECT_INTROSPECTION_FOUND)
-             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
- 
-         add_custom_command(OUTPUT ${GIR_TYPELIB}
--            COMMAND ${GOBJECT_INTROSPECTION_1.0_G_IR_COMPILER}
-+            COMMAND $ENV{PKG_CONFIG_SYSROOT_DIR}${GOBJECT_INTROSPECTION_1.0_G_IR_COMPILER}
-                     -o ${GIR_TYPELIB}
-                     ${GIR_XML}
-             DEPENDS ${GIR_XML}
--- 
-2.11.0
-
meta/recipes-devtools/libdnf/libdnf_0.11.1.bb +0 -1
index 4fc1d6d..a79fcdf 100644
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://github.com/rpm-software-management/libdnf \
            file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \
-           file://0002-Prefix-sysroot-path-to-introspection-tools-path.patch \
            file://0003-Set-the-library-installation-directory-correctly.patch \
            file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
            file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
Signature · 1 line
2.4.0
#14 lore raw

PATCH 10/27 vala: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This helps us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1) 0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch

---
 ...001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch | 38 ----------------------
 meta/recipes-devtools/vala/vala_0.38.6.bb          |  1 -
 2 files changed, 39 deletions(-)
 delete mode 100644 meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch deleted +0 -38
deleted file mode 100644
index ecab0fc..0000000
@@ -1,38 +0,0 @@
-From dbb1c58e86f2af4613f3ac9571d9b163d4bca675 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Fri, 23 Oct 2015 16:13:54 +0300
-Subject: [PATCH] vapigen.m4: use $PKG_CONFIG_SYSROOT_DIR
-
-This is necessary in cross-compiling environments, where directories
-returned by pkg-config should be prefixed with sysroot location.
-
-Upstream-Status: Pending [review in oe-core list]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- vapigen/vapigen.m4 | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/vapigen/vapigen.m4 b/vapigen/vapigen.m4
-index 2c435e7..6228991 100644
---- a/vapigen/vapigen.m4
-+++ b/vapigen/vapigen.m4
-@@ -82,12 +82,12 @@ AC_DEFUN([VAPIGEN_CHECK],
- 
-   AS_CASE([$enable_vala],
-     [yes], [
--      VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
--      VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
-+      VAPIGEN=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name`
-+      VAPIGEN_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen
-       AS_IF([test "x$2" = "x"], [
--          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
-+          VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
-         ], [
--          VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
-+          VAPIGEN_VAPIDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
-         ])
-     ])
- 
--- 
-2.1.4
-
meta/recipes-devtools/vala/vala_0.38.6.bb +0 -1
index b0b8e00..f1a2a51 100644
@@ -1,7 +1,6 @@
 require ${BPN}.inc
 
 SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
-             file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
 	     file://disable-graphviz.patch \
 	     file://0001-Disable-valadoc.patch \
 "
Signature · 1 line
2.4.0
#15 lore raw

PATCH 11/27 gobject-introspection: remove PKG_CONFIG_SYSROOT_DIR work-around

In reply to Maxin B. John

We are moving from freedesktop.org's pkg-config to pkgconf. This helps us to remove the following patch as PKG_CONFIG_SYSROOT_DIR behaves consistently with pkgconf:

1) 0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch

---
 ...config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch | 96 ----------------------
 .../gobject-introspection_1.54.1.bb                |  1 -
 2 files changed, 97 deletions(-)
 delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch deleted +0 -96
deleted file mode 100644
index 47a18ec..0000000
@@ -1,96 +0,0 @@
-From e08b3677dd04d6ec407ba8f74f601b2d51310eff Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Thu, 8 Oct 2015 18:30:35 +0300
-Subject: [PATCH 5/5] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
- environment variable
-
-This environment variable sets the location of sysroot directory in cross-compilation
-environments; if the variable is not set, the prefix will be empty.
-
-Upstream-Status: Pending [review on oe-core list]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- Makefile-gir.am     | 18 +++++++++---------
- m4/introspection.m4 |  8 ++++----
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile-gir.am b/Makefile-gir.am
-index a09260a..ba6e89e 100644
---- a/Makefile-gir.am
-+++ b/Makefile-gir.am
-@@ -55,8 +55,8 @@ else
- endif
- 
- # glib
--GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
--GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
-+GLIB_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
-+GLIB_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
- 
- GLIB_LIBRARY=glib-2.0
- 
-@@ -92,8 +92,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
- gir/DBusGLib-1.0.typelib: GObject-2.0.gir
- 
- # gobject
--GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
--GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
-+GOBJECT_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
-+GOBJECT_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
- 
- GOBJECT_LIBRARY=gobject-2.0
- 
-@@ -120,8 +120,8 @@ GObject_2_0_gir_FILES = \
- BUILT_GIRSOURCES += GObject-2.0.gir
- 
- # gmodule
--GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
--GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
-+GMODULE_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
-+GMODULE_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
- 
- GMODULE_LIBRARY=gmodule-2.0
- 
-@@ -146,13 +146,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
- BUILT_GIRSOURCES += GModule-2.0.gir
- 
- # gio
--GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
--GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
-+GIO_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
-+GIO_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
- 
- GIO_LIBRARY=gio-2.0
- 
- if HAVE_GIO_UNIX
--GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
-+GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
- GIO_UNIX_HDRS = $(GIO_UNIX_INCLUDEDIR)/gio/*.h
- GIO_UNIX_PACKAGES = gio-unix-2.0
- else
-diff --git a/m4/introspection.m4 b/m4/introspection.m4
-index d89c3d9..b562266 100644
---- a/m4/introspection.m4
-+++ b/m4/introspection.m4
-@@ -56,14 +56,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-     INTROSPECTION_GIRDIR=
-     INTROSPECTION_TYPELIBDIR=
-     if test "x$found_introspection" = "xyes"; then
--       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
--       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
--       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+       INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+       INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+       INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
--       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-+       INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-     fi
-     AC_SUBST(INTROSPECTION_SCANNER)
-     AC_SUBST(INTROSPECTION_COMPILER)
--- 
-2.7.0
-
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb +0 -1
index 85c8001..076593e 100644
@@ -13,7 +13,6 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/1.54/${BPN}-${PV}.tar.xz \
            file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \
            file://0003-giscanner-add-use-binary-wrapper-option.patch \
            file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \
-           file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
            file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \
            "
 SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41"
Signature · 1 line
2.4.0
#16 lore raw

PATCH 12/27 kmod: define bashcompletiondir

In reply to Maxin B. John

After moving to pkgconf, kmod package qa test fails without it.

---
 meta/recipes-kernel/kmod/kmod_git.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-kernel/kmod/kmod_git.bb +2 -0
index 69185b2..251681f 100644
@@ -17,6 +17,8 @@ bindir = "${base_bindir}"
 sbindir = "${base_sbindir}"
 # libdir = "${base_libdir}"
 
+EXTRA_OECONF = "--with-bashcompletiondir='${datadir}/bash-completion/'"
+
 do_install_append () {
         install -dm755 ${D}${base_bindir}
         install -dm755 ${D}${base_sbindir}
Signature · 1 line
2.4.0
#17 lore raw

Re: [PATCH 12/27] kmod: define bashcompletiondir

Quoted 2 lines · Maxin B. John

After moving to pkgconf, kmod package qa test fails without it.

Is this failing because pkgconf returns a full path (/path/to/my/build/usr/share/bash-completion) instead of the path in the pc (/usr/share/bash-completion)? In the context of a target path in a makefile, the latter is correct and the former is very wrong.

I really do think that the pkgconfig and pkgconf maintainers need to be locked in a room and argue this out. It's not a drop-in replacement if the behaviour changes...

Ross

#18 lore raw

Re: [PATCH 12/27] kmod: define bashcompletiondir

Hi Ross,

Quoted 5 lines · Ross
Quoted 3 lines · Maxin B. John

After moving to pkgconf, kmod package qa test fails without it.

Is this failing because pkgconf returns a full path (/path/to/my/build/usr/share/bash-completion) instead of the path in the pc (/usr/share/bash-completion)? In the context of a target path in a makefile, the latter is correct and the former is very wrong.

Due to this line in configure.ac:
with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)

combined with this:
$(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletiondir)"

Quoted 1 line

I really do think that the pkgconfig and pkgconf maintainers need to be locked in a room and argue this out. It's not a drop-in replacement if the behaviour changes...

Good suggestion :)
While ageeing that these changes doesn't look good, I will try to find other reasonable fixes, if any.

Quoted 1 line

Ross

Best Regards,
Maxin

#19 lore raw

Re: [PATCH 12/27] kmod: define bashcompletiondir

Quoted 12 lines · Maxin B. John
Quoted 1 line · Ross
Quoted 1 line

On 19 February 2018 at 08:37, Maxin B. John <[email protected]>

Quoted 4 lines · wrote:
Quoted 2 lines

After moving to pkgconf, kmod package qa test fails without it.

Is this failing because pkgconf returns a full path

(/path/to/my/build/usr/share/bash-completion) instead of the path in the pc (/usr/share/bash-completion)? In the context of a target path in a makefile, the latter is correct and the former is very wrong.

Quoted 7 lines

Due to this line in configure.ac:
with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)

combined with this:
$(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletiondir)"

Which you have to admit seems like the right thing to do... I'd argue that pkgconf is doing the wrong thing here.

Ross

#20 lore raw

PATCH 13/27 util-linux: define bashcompletiondir

In reply to Maxin B. John

After moving to pkgconf, util-linux package qa test fails without it.

---
 meta/recipes-core/util-linux/util-linux.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/util-linux/util-linux.inc +1 -0
index 248e8be..0104ca1 100644
@@ -50,6 +50,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \
                        --enable-libuuid --enable-libblkid --enable-fsck \
                        --disable-minix --disable-bfs --without-udev \
                        usrsbin_execdir='${sbindir}' \
+                       --with-bashcompletiondir='${datadir}/bash-completion/' \
 "
 
 EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}"
Signature · 1 line
2.4.0
#21 lore raw

PATCH 14/27 systemd: define bashcompletiondir

In reply to Maxin B. John

After moving to pkgconf, systemd package qa test fails without it.

---
 meta/recipes-core/systemd/systemd_234.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_234.bb +1 -0
index d12e94f..217922c 100644
@@ -185,6 +185,7 @@ EXTRA_OECONF = " \
     --with-rootprefix=${rootprefix} \
     --with-sysvrcnd-path=${sysconfdir} \
     --with-firmware-path=${nonarch_base_libdir}/firmware \
+    --with-bashcompletiondir=${datadir}/bash-completion \
 "
 
 # per the systemd README, define VALGRIND=1 to run under valgrind
Signature · 1 line
2.4.0
#22 lore raw

PATCH 15/27 libinput: fix udev path for pkgconf

In reply to Maxin B. John

Here we need udev path to be relative, inside the sysroot. Unset PKG_CONFIG_SYSROOT_DIR to fix it.

---
 meta/recipes-graphics/wayland/libinput_1.9.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/libinput_1.9.4.bb +1 -1
index 67a49df..32b98ab 100644
@@ -19,7 +19,7 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom"
 PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3"
 
-UDEVDIR = "`pkg-config --variable=udevdir udev`"
+UDEVDIR = "`unset PKG_CONFIG_SYSROOT_DIR; pkg-config --variable=udevdir udev`"
 
 EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} -Ddocumentation=false -Dtests=false"
 
Signature · 1 line
2.4.0
#23 lore raw

PATCH 16/27 pulseaudio: fix udev path for pkgconf

In reply to Maxin B. John

Here we need udev path to be relative, inside the sysroot. Unset PKG_CONFIG_SYSROOT_DIR to fix it.

---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -1
index 8189a56..821a12d 100644
@@ -80,7 +80,7 @@ EXTRA_OECONF = "\
 		--disable-openssl \
 		--with-database=simple \
 		--without-zsh-completion-dir \
-		--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d \
+		--with-udev-rules-dir=`unset PKG_CONFIG_SYSROOT_DIR;pkg-config --variable=udevdir udev`/rules.d \
                 ac_cv_header_valgrind_memcheck_h=no \
                 --disable-tests \
 "
Signature · 1 line
2.4.0
#24 lore raw

PATCH 17/27 alsa-utils: fix udev path for pkgconf

In reply to Maxin B. John

Here we need udev path to be relative, inside the sysroot. Unset PKG_CONFIG_SYSROOT_DIR to fix it.

---
 meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb +3 -2
index f2231f3..1ee5285 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0"
 
-PACKAGECONFIG ??= "udev"
+PACKAGECONFIG ??= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 
 # alsabat can be built also without fftw support (with reduced functionality).
 # It would be better to always enable alsabat, but provide an option for
@@ -16,8 +16,9 @@ PACKAGECONFIG ??= "udev"
 # or no alsabat at all.
 PACKAGECONFIG[bat] = "--enable-bat,--disable-bat,fftwf"
 
-PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
+PACKAGECONFIG[udev] = "--with-udev-rules-dir=`unset PKG_CONFIG_SYSROOT_DIR; pkg-config --variable=udevdir udev`/rules.d,,udev"
 PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,systemd"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
Signature · 1 line
2.4.0
#25 lore raw

PATCH 18/27 ofono: specify dbusconfdir

In reply to Maxin B. John

Explicitly specify the dbusconfdir.

---
 meta/recipes-connectivity/ofono/ofono.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/ofono/ofono.inc +1 -1
index 0472414..dc6b0b8 100644
@@ -19,7 +19,7 @@ PACKAGECONFIG ??= "\
 PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
 PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}"
 
-EXTRA_OECONF += "--enable-test"
+EXTRA_OECONF += "--enable-test --with-dbusconfdir=${sysconfdir}"
 
 SYSTEMD_SERVICE_${PN} = "ofono.service"
 
Signature · 1 line
2.4.0
#26 lore raw

PATCH 19/27 connman: specify dbusconfdir

In reply to Maxin B. John

Explicitly specify the dbusconfdir.

---
 meta/recipes-connectivity/connman/connman.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-connectivity/connman/connman.inc +1 -0
index 2b03f9c..e2b5f47 100644
@@ -28,6 +28,7 @@ EXTRA_OECONF += "\
     --enable-tools \
     --disable-polkit \
     --enable-client \
+    --with-dbusconfdir=${sysconfdir} \
 "
 
 PACKAGECONFIG ??= "wispr \
Signature · 1 line
2.4.0
#27 lore raw

PATCH 20/27 bluez5: specify udev, dbus and systemd configurations

In reply to Maxin B. John

configure udevdir, systemd-unitsdir and dbusconfdir. Also provide a packageconfig for systemd.

---
 meta/recipes-connectivity/bluez5/bluez5.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
meta/recipes-connectivity/bluez5/bluez5.inc +6 -2
index 2607a05..cf61a9e 100644
@@ -27,7 +27,7 @@ PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
 PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
 PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
 PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
-PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
+PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir} --with-systemduserunitdir=${systemd_user_unitdir},--disable-systemd"
 PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups"
 PACKAGECONFIG[nfc] = "--enable-nfc,--disable-nfc"
 PACKAGECONFIG[sap-profiles] = "--enable-sap,--disable-sap"
@@ -61,7 +61,11 @@ EXTRA_OECONF = "\
   --enable-test \
   --enable-datafiles \
   --enable-library \
-"
+  --with-udevdir=`unset PKG_CONFIG_SYSROOT_DIR;pkg-config --variable=udevdir udev` \
+  --with-dbusconfdir=${sysconfdir}/dbus-1/system.d \
+  --with-dbussessionbusdir=${datadir}/dbus-1/services/ \
+  --with-dbussystembusdir=${datadir}/dbus-1/system-services/ \
+  "
 
 # bluez5 builds a large number of useful utilities but does not
 # install them.  Specify which ones we want put into ${PN}-noinst-tools.
Signature · 1 line
2.4.0
#28 lore raw

PATCH 21/27 xf86-input-synaptics: fix installation paths

In reply to Maxin B. John

Fix the installations paths of xf86-input-synaptics. This was caused by the change of pkg-config provider to pkgconf.

---
 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb +2 -0
index d327a3b..35dbe50 100644
@@ -14,3 +14,5 @@ SRC_URI[md5sum] = "58e5b7722a402114093bf193962d1e3a"
 SRC_URI[sha256sum] = "afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a"
 
 DEPENDS += "libxi mtdev libxtst libevdev"
+
+EXTRA_OECONF += "--with-sdkdir=${includedir}/xorg --with-xorg-conf-dir=${datadir}/X11/xorg.conf.d"
Signature · 1 line
2.4.0
#29 lore raw

PATCH 22/27 xf86-input-mouse: fix header-file installation path

In reply to Maxin B. John

Fix the header-file installation paths of xf86-input-mouse. This was caused by the change of pkg-config provider to pkgconf.

---
 meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb +2 -0
index 0750476..2945eb0 100644
@@ -12,3 +12,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510"
 
 SRC_URI[md5sum] = "ce2d679283a22c8e0dccdd9248594845"
 SRC_URI[sha256sum] = "f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f"
+
+EXTRA_OECONF += "--with-sdkdir=${includedir}/xorg"
Signature · 1 line
2.4.0
#30 lore raw

PATCH 23/27 xf86-input-libinput: fix header-file installation path

In reply to Maxin B. John

Fix the header-file installation path (sdkdir) of xf86-input-libinput. This was caused by the change of pkg-config provider to pkgconf.

---
 meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb +2 -0
index 54c33d7..edc9037 100644
@@ -9,3 +9,5 @@ SRC_URI[md5sum] = "da47ef62eab1d0e922a8fa929ff81758"
 SRC_URI[sha256sum] = "abca558fc2226f295691f1cf3412d4c0edeaa439f677ca25b5c9fab310d2387b"
 
 FILES_${PN} += "${datadir}/X11/xorg.conf.d"
+
+EXTRA_OECONF += "--with-sdkdir=${includedir}/xorg"
Signature · 1 line
2.4.0
#31 lore raw

PATCH 24/27 xf86-input-evdev: fix header-file installation path

In reply to Maxin B. John

Fix the header-file installation path (sdkdir) of xf86-input-evdev. This was caused by the change of pkg-config provider to pkgconf.

---
 meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.5.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.5.bb +1 -0
index 96b220c..eaa7507 100644
@@ -19,3 +19,4 @@ DEPENDS += "mtdev libevdev"
 SRC_URI[md5sum] = "94c2c8354c74ab1cfbbb0a222078b9c6"
 SRC_URI[sha256sum] = "9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d"
 
+EXTRA_OECONF += "--with-sdkdir=${includedir}/xorg"
Signature · 1 line
2.4.0
#32 lore raw

PATCH 25/27 glib-networking: unset PKG_CONFIG_SYSROOT_DIR for relative path

In reply to Maxin B. John

pkgconf needs to unset PKG_CONFIG_SYSROOT_DIR for relative path.

---
 ...c-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch | 31 ++++++++++++++++++++++
 .../glib-networking/glib-networking_2.54.1.bb      |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-core/glib-networking/glib-networking/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch
meta/recipes-core/glib-networking/glib-networking/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch new file +31 -0
new file mode 100644
index 0000000..08879b9
@@ -0,0 +1,31 @@
+From f0fe611b1b24cbeafed380b1956ab21b09419c64 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <[email protected]>
+Date: Fri, 16 Feb 2018 16:12:22 +0200
+Subject: [PATCH] configure.ac: unset PKG_CONFIG_SYSROOT_DIR for relative path
+
+pkgconf requires unsetting  PKG_CONFIG_SYSROOT_DIR to find
+the relative path of giomoduledir.
+
+Upstream-Status: Inappropriate [specific to pkgconf]
+
+Signed-off-by: Maxin B. John <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ddee2a7..e31f397 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,7 @@ dnl *****************************
+ AM_PATH_GLIB_2_0(2.46.0,,AC_MSG_ERROR(GLIB not found),gio)
+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46"
+ 
+-GIO_MODULE_DIR=$($PKG_CONFIG --variable giomoduledir gio-2.0)
++GIO_MODULE_DIR=$(unset PKG_CONFIG_SYSROOT_DIR; $PKG_CONFIG --variable giomoduledir gio-2.0)
+ AS_IF([test "$GIO_MODULE_DIR" = ""],
+       [AC_MSG_FAILURE(GIO_MODULE_DIR is missing from gio-2.0.pc)])
+ AC_SUBST(GIO_MODULE_DIR)
+-- 
+2.4.0
+
meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +2 -0
index 2a6f8af..c9dceae 100644
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 SECTION = "libs"
 DEPENDS = "glib-2.0"
 
+SRC_URI_append = " file://0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch"
+
 SRC_URI[archive.md5sum] = "99867463f182c2767bce0c74bc9cc981"
 SRC_URI[archive.sha256sum] = "eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f"
 
Signature · 1 line
2.4.0
#33 lore raw

PATCH 26/27 btrfs-tools: unset PKG_CONFIG_SYSROOT_DIR for relative path

In reply to Maxin B. John

pkgconf needs to unset PKG_CONFIG_SYSROOT_DIR for relative path.

---
 ...c-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch | 31 ++++++++++++++++++++++
 .../btrfs-tools/btrfs-tools_4.13.3.bb              |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch new file +31 -0
new file mode 100644
index 0000000..2fcee50
@@ -0,0 +1,31 @@
+From 5aca78ff82a5f79ec33c4eda1e5d8c214ee14e65 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <[email protected]>
+Date: Fri, 16 Feb 2018 09:44:48 +0200
+Subject: [PATCH] configure.ac: unset  PKG_CONFIG_SYSROOT_DIR for relative path
+
+pkgconf requires unsetting  PKG_CONFIG_SYSROOT_DIR to find the relative
+path.
+
+Upstream-Status: Inappropriate [specific to pkgconf]
+
+Signed-off-by: Maxin B. John <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 290dc1d..305337d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -204,7 +204,7 @@ AC_SUBST(BTRFSRESTORE_ZSTD)
+ # on earlier releases.
+ UDEVDIR=
+ if pkg-config udev --atleast-version 190; then
+-	UDEVDIR="$(pkg-config udev --variable=udevdir)"
++	UDEVDIR="'unset PKG_CONFIG_SYSROOT_DIR; $(pkg-config udev --variable=udevdir)'"
+ fi
+ AC_SUBST(UDEVDIR)
+ 
+-- 
+2.4.0
+
meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb +1 -0
index 263fc65..8ec652f 100644
@@ -18,6 +18,7 @@ SRCREV = "a7a1ea0f4f2a1d6eeeb3d106e062c7f1034f16d4"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Makefile-build-mktables-using-native-gcc.patch \
            file://0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch \
+           file://0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch \
            "
 
 inherit autotools-brokensep pkgconfig manpages
Signature · 1 line
2.4.0
#34 lore raw

PATCH 27/27 librsvg: unset PKG_CONFIG_SYSROOT_DIR for relative path

In reply to Maxin B. John

pkgconf needs to unset PKG_CONFIG_SYSROOT_DIR for relative path.

---
 .../0001-configure.ac-fix-build-with-pkgconf.patch | 32 ++++++++++++++++++++++
 meta/recipes-gnome/librsvg/librsvg_2.40.20.bb      |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-configure.ac-fix-build-with-pkgconf.patch
meta/recipes-gnome/librsvg/librsvg/0001-configure.ac-fix-build-with-pkgconf.patch new file +32 -0
new file mode 100644
index 0000000..54c0e35
@@ -0,0 +1,32 @@
+From 5935c18d1748f9b3324a4b13980df54d9a8c779f Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <[email protected]>
+Date: Sun, 18 Feb 2018 13:41:28 +0200
+Subject: [PATCH] configure.ac: fix build with pkgconf
+
+pkgconf requires to unset PKG_CONFIG_SYSROOT_DIR for relative path.
+
+Upstream-Status: Inappropriate [specific to pkgconf]
+
+Signed-off-by: Maxin B. John <[email protected]>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8852862..7151503 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,8 +170,8 @@ if test "$enable_pixbuf_loader" = "yes"; then
+ 
+   # First try the standalone gdk-pixbuf
+   gdk_pixbuf_binary_version="`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0`"
+-  gdk_pixbuf_binarydir="`$PKG_CONFIG --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0`"
+-  gdk_pixbuf_moduledir=`$PKG_CONFIG --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0`
++  gdk_pixbuf_binarydir="`unset PKG_CONFIG_SYSROOT_DIR; $PKG_CONFIG --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0`"
++  gdk_pixbuf_moduledir=`unset PKG_CONFIG_SYSROOT_DIR; $PKG_CONFIG --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0`
+   gdk_pixbuf_cache_file=`$PKG_CONFIG --variable gdk_pixbuf_cache_file gdk-pixbuf-2.0`
+ fi
+ 
+-- 
+2.4.0
+
meta/recipes-gnome/librsvg/librsvg_2.40.20.bb +3 -1
index cd44530..edd37c3 100644
@@ -12,7 +12,9 @@ BBCLASSEXTEND = "native"
 
 inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspection
 
-SRC_URI += "file://gtk-option.patch"
+SRC_URI += "file://gtk-option.patch \
+            file://0001-configure.ac-fix-build-with-pkgconf.patch \
+           "
 
 SRC_URI[archive.md5sum] = "4949d313b0c5d9161a5c259104af5568"
 SRC_URI[archive.sha256sum] = "cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b"
Signature · 1 line
2.4.0
#35 lore raw
In reply to Maxin B. John
Quoted 6 lines · Maxin B. John

Reasons behind this patch set:

1. pkgconf is actively maintained
2. pkgconf has better cross-compiling support (According to the author of pkgconf, it was created as he got tired of patching .pc files to add ${pc_sysrootdir})
3. oe-core can drop a number of work-around patches that deals with pkg-config

Thanks! I too was getting tired of all those workaround patches.

pkg-config is still better than the too clever by half discovery macros of autoconf :)

Alex