mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/pkgconf: fix sysroot being prepended twice to the pkgdatadir path

Browse Source 
When building webkit, I got this build error:

>>> webkitgtk 2.46.3 Building
GIT_DIR=. PATH="/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/bin:/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/sbin:/home/thomas/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin"
 /home/thomas/.local/bin/cmake --build
/home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/
-j25
ninja: error: '/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/share/wayland-protocols/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
needed by 'WebKitGTK/DerivedSources/pointer-constraints-unstable-v1-protocol.c',
missing and no known rule to make it
make[1]: *** [package/pkg-generic.mk:289:
/home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/.stamp_built]
Error 1
make: *** [Makefile:83: _all] Error 2

The sysroot path is prepended twice to the path. This error persists
since a3b2bc8 "package/pkgconf: bump to version 2.3.0".

After digging into it, I found out that dropping "pkgdatadir" from the
patch does fix it. This is, in fact, the same, or similar problem that
was fixed in 3e74c13 "package/pkgconf: variable pkgdatadir also needs
sysroot prefixing, wayland patch III" years ago.

I was not able to find out which pkgconf commit caused the behavior
change. Commit a3b2bc8 bumped it from 1.6.3 to 2.3.0, which is a
considerable big change.

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Devoogdt
2024-12-18 09:43:37 +01:00
committed by Peter Korsgaard
parent 9eeb8108c6
commit 139b580ca4
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
View File

@@ -1,4 +1,4 @@
From c1f9e60f46f2207f9dd07dd290ad5a2da05ad41d Mon Sep 17 00:00:00 2001 From c912e9bb8d5be414fda74b2019deb2a6d2d041a0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com> From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 16 Dec 2018 11:52:18 +0100 Date: Sun, 16 Dec 2018 11:52:18 +0100
Subject: [PATCH] Only prefix with the sysroot a subset of variables Subject: [PATCH] Only prefix with the sysroot a subset of variables
@@ -22,15 +22,17 @@ Buildroot development. All other paths are not prefixed by the sysroot.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Updated to include gobject-introspection paths] [Updated to include gobject-introspection paths]
Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Adam Duskett <aduskett@gmail.com>
[Dropped the pkgdatadir path]
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
--- ---
libpkgconf/tuple.c | 65 ++++++++++++++++++++++++++++++++-------------- libpkgconf/tuple.c | 64 ++++++++++++++++++++++++++++++++--------------
1 file changed, 46 insertions(+), 19 deletions(-) 1 file changed, 45 insertions(+), 19 deletions(-)
diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c
index 83f6a47..a2aa427 100644 index 83f6a47..d56fcec 100644
--- a/libpkgconf/tuple.c --- a/libpkgconf/tuple.c
+++ b/libpkgconf/tuple.c +++ b/libpkgconf/tuple.c
@@ -178,6 +178,21 @@ dequote(const char *value) @@ -178,6 +178,20 @@ dequote(const char *value)
return buf; return buf;
} }
@@ -44,7 +46,6 @@ index 83f6a47..a2aa427 100644
+ "includedir", + "includedir",
+ "libdir", + "libdir",
+ "mapdir", + "mapdir",
+ "pkgdatadir",
+ "sdkdir", + "sdkdir",
+ NULL, + NULL,
+}; +};
@@ -52,7 +53,7 @@ index 83f6a47..a2aa427 100644
static const char * static const char *
find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars) find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars)
{ {
@@ -237,14 +252,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch @@ -237,14 +251,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch
{ {
char *dequote_value; char *dequote_value;
pkgconf_tuple_t *tuple = calloc(1, sizeof(pkgconf_tuple_t)); pkgconf_tuple_t *tuple = calloc(1, sizeof(pkgconf_tuple_t));
@@ -74,7 +75,7 @@ index 83f6a47..a2aa427 100644
else else
tuple->value = strdup(dequote_value); tuple->value = strdup(dequote_value);
@@ -294,22 +315,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c @@ -294,22 +314,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c
return NULL; return NULL;
} }
@@ -99,7 +100,7 @@ index 83f6a47..a2aa427 100644
{ {
char buf[PKGCONF_BUFSIZE]; char buf[PKGCONF_BUFSIZE];
const char *ptr; const char *ptr;
@@ -318,7 +325,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const @@ -318,7 +324,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) && if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) &&
(!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES))) (!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES)))
{ {
@@ -108,7 +109,7 @@ index 83f6a47..a2aa427 100644
bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf); bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf);
} }
@@ -381,7 +388,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const @@ -381,7 +387,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
{ {
size_t nlen; size_t nlen;
@@ -117,7 +118,7 @@ index 83f6a47..a2aa427 100644
nlen = pkgconf_strlcpy(bptr, parsekv, remain); nlen = pkgconf_strlcpy(bptr, parsekv, remain);
free(parsekv); free(parsekv);
@@ -432,6 +439,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const @@ -432,6 +438,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
return strdup(buf); return strdup(buf);
} }
@@ -145,5 +146,5 @@ index 83f6a47..a2aa427 100644
* !doc * !doc
* *
-- --
2.34.1 2.43.0