diff options
| author | Michael J. Hammel <mjhammel@graphics-muse.org> | 2011-04-23 20:51:41 -0600 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-08-04 22:13:37 +0200 |
| commit | 5496bc399bc9eee202dbd7bd1d143722f30536e9 (patch) | |
| tree | 61ad3f39a99b4723c0f42cefd1ca522b7c067252 | |
| parent | 5255a7197b858c4cb5632e12d2097b75b68518e7 (diff) | |
pkg-config: Add "mapdir" to sysroot handled variables
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>
| -rw-r--r-- | CHANGES | 10 | ||||
| -rw-r--r-- | package/pkg-config/pkg-config-0.25-fix-variable.patch | 7 |
2 files changed, 10 insertions, 7 deletions
@@ -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 diff --git a/package/pkg-config/pkg-config-0.25-fix-variable.patch b/package/pkg-config/pkg-config-0.25-fix-variable.patch index 0b1d4a9d8..13a2b9191 100644 --- a/package/pkg-config/pkg-config-0.25-fix-variable.patch +++ b/package/pkg-config/pkg-config-0.25-fix-variable.patch @@ -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); |