Commit 5496bc39 authored by Michael J. Hammel's avatar Michael J. Hammel Committed by Peter Korsgaard
Browse files

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



Closes #3583, #3649

Fixes xfonts_font-adobe build failure.

Signed-off-by: default avatarMichael J. Hammel <mjhammel@graphics-muse.org>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 5255a719

CHANGES

+6 −4
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 
	gvfs, hostapd, iproute2, iptables, iw, jpeg, lame, libarchive,

	libdnet, libdrm, libgcrypt, libgtk2, libmpeg2, libpng,

	libsoup, lighttpd, linux-fusion, lzo, midori, mtd-utils,

	nfs-utils, openvpn, oprofile, orc, proftpd, qt, ruby, samba,

	sdl, shared-mime-info, sudo, sqlite, squid, synergy, udev,

	usbmount, usbutils, util-linux, valgrind, webkit,

	xorg-xserver, xz, zlib

	nfs-utils, openvpn, oprofile, orc, pkg-config, proftpd, qt,

	ruby, samba, sdl, shared-mime-info, sudo, sqlite, squid,

	synergy, udev, usbmount, usbutils, util-linux, valgrind,

	webkit, xorg-xserver, xz, zlib



	New packages: acl, attr, ebtables, gnutls, inotify-tools,

	ipset, libargtable2, libiqrf, libmnl, libnspr, libnss,
@@ -40,6 +40,8 @@ 
	#3559: libnspr: Add new package

	#3595: patch to add libroxml

	#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

	#3961: Nfs-utils: Remove SUSv3-function index

	#3985: "help" target's defconfig list needs sort

package/pkg-config/pkg-config-0.25-fix-variable.patch

+4 −3
Original line number Diff line number Diff line
@@ -8,20 +8,21 @@ so ensure the sysroot'ed files are used. 


Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 main.c |    5 +++++

 1 file changed, 5 insertions(+)

 main.c |    6 +++++

 1 file changed, 6 insertions(+)



Index: pkg-config-0.25/main.c

===================================================================

--- pkg-config-0.25.orig/main.c

+++ pkg-config-0.25/main.c

@@ -700,6 +700,11 @@

@@ -700,6 +700,12 @@

   if (variable_name)

     {

       char *str = packages_get_var (packages, variable_name);

+      /* include/lib variable? */

+      if (pcsysrootdir &&

+          (!strcmp(variable_name, "includedir") ||

+           !strcmp(variable_name, "mapdir") ||

+           !strcmp(variable_name, "libdir")))

+          printf ("%s/", pcsysrootdir);

       printf ("%s", str);