[OE-core] [PATCH 26/27] btrfs-tools: unset PKG_CONFIG_SYSROOT_DIR for relative path
Maxin B. John
maxin.john at intel.com
Mon Feb 19 08:37:17 UTC 2018
pkgconf needs to unset PKG_CONFIG_SYSROOT_DIR for relative path.
Signed-off-by: Maxin B. John <maxin.john at intel.com>
---
...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
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch
new file mode 100644
index 0000000..2fcee50
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-configure.ac-unset-PKG_CONFIG_SYSROOT_DIR-for-relati.patch
@@ -0,0 +1,31 @@
+From 5aca78ff82a5f79ec33c4eda1e5d8c214ee14e65 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <maxin.john at intel.com>
+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 <maxin.john at intel.com>
+---
+ 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
+
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
index 263fc65..8ec652f 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
@@ -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
--
2.4.0
More information about the Openembedded-core
mailing list