NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg-config: Add "mapdir" to sysroot handled variables

Browse Source 
Closes #3583, #3649

Fixes xfonts_font-adobe build failure.

Signed-off-by: Michael J. Hammel <mjhammel@graphics-muse.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Michael J. Hammel 2011-04-23 20:51:41 -06:00 committed by Peter Korsgaard
parent 5255a7197b
commit 5496bc399b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGES
View File

@ -21,10 +21,10 @@
gvfs, hostapd, iproute2, iptables, iw, jpeg, lame, libarchive, gvfs, hostapd, iproute2, iptables, iw, jpeg, lame, libarchive,
libdnet, libdrm, libgcrypt, libgtk2, libmpeg2, libpng, libdnet, libdrm, libgcrypt, libgtk2, libmpeg2, libpng,
libsoup, lighttpd, linux-fusion, lzo, midori, mtd-utils, libsoup, lighttpd, linux-fusion, lzo, midori, mtd-utils,
nfs-utils, openvpn, oprofile, orc, proftpd, qt, ruby, samba, nfs-utils, openvpn, oprofile, orc, pkg-config, proftpd, qt,
sdl, shared-mime-info, sudo, sqlite, squid, synergy, udev, ruby, samba, sdl, shared-mime-info, sudo, sqlite, squid,
usbmount, usbutils, util-linux, valgrind, webkit, synergy, udev, usbmount, usbutils, util-linux, valgrind,
xorg-xserver, xz, zlib webkit, xorg-xserver, xz, zlib
New packages: acl, attr, ebtables, gnutls, inotify-tools, New packages: acl, attr, ebtables, gnutls, inotify-tools,
ipset, libargtable2, libiqrf, libmnl, libnspr, libnss, ipset, libargtable2, libiqrf, libmnl, libnspr, libnss,
@ -40,6 +40,8 @@
#3559: libnspr: Add new package #3559: libnspr: Add new package
#3595: patch to add libroxml #3595: patch to add libroxml
#3565: libnss: Add new package #3565: libnss: Add new package
#3583: xfonts_font-adobe-100dpi fails due to missing map file
#3649: [PATCH] Add mapdir to existing pkg-config patch
#3907: 2011.05 - Qt 4.7.3 not building on ARM #3907: 2011.05 - Qt 4.7.3 not building on ARM
#3961: Nfs-utils: Remove SUSv3-function index #3961: Nfs-utils: Remove SUSv3-function index
#3985: "help" target's defconfig list needs sort #3985: "help" target's defconfig list needs sort

7
package/pkg-config/pkg-config-0.25-fix-variable.patch
View File

@ -8,20 +8,21 @@ so ensure the sysroot'ed files are used.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
--- ---
main.c | 5 +++++ main.c | 6 +++++
1 file changed, 5 insertions(+) 1 file changed, 6 insertions(+)
Index: pkg-config-0.25/main.c Index: pkg-config-0.25/main.c
=================================================================== ===================================================================
--- pkg-config-0.25.orig/main.c --- pkg-config-0.25.orig/main.c
+++ pkg-config-0.25/main.c +++ pkg-config-0.25/main.c
@@ -700,6 +700,11 @@ @@ -700,6 +700,12 @@
if (variable_name) if (variable_name)
{ {
char *str = packages_get_var (packages, variable_name); char *str = packages_get_var (packages, variable_name);
+ /* include/lib variable? */ + /* include/lib variable? */
+ if (pcsysrootdir && + if (pcsysrootdir &&
+ (!strcmp(variable_name, "includedir") || + (!strcmp(variable_name, "includedir") ||
+ !strcmp(variable_name, "mapdir") ||
+ !strcmp(variable_name, "libdir"))) + !strcmp(variable_name, "libdir")))
+ printf ("%s/", pcsysrootdir); + printf ("%s/", pcsysrootdir);
printf ("%s", str); printf ("%s", str);