diff options
| -rw-r--r-- | package/pkg-config/pkg-config-0.23-fix-sysroot.patch | 34 | ||||
| -rw-r--r-- | package/pkg-config/pkg-config.mk | 2 |
2 files changed, 1 insertions, 35 deletions
diff --git a/package/pkg-config/pkg-config-0.23-fix-sysroot.patch b/package/pkg-config/pkg-config-0.23-fix-sysroot.patch deleted file mode 100644 index 36538112b..000000000 --- a/package/pkg-config/pkg-config-0.23-fix-sysroot.patch +++ /dev/null @@ -1,34 +0,0 @@ -[PATCH] fix PKG_CONFIG_SYSROOT_DIR handling - -With PKG_CONFIG_SYSROOT_DIR enabled, everything else than -L and -I words -gets stripped away. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - pkg.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -Index: pkg-config-0.23/pkg.c -=================================================================== ---- pkg-config-0.23.orig/pkg.c -+++ pkg-config-0.23/pkg.c -@@ -472,17 +472,13 @@ - while (tmp != NULL) - { - char *tmpstr = (char*) tmp->data; -- if (pcsysrootdir != NULL) -+ if (pcsysrootdir != NULL && tmpstr[0] == '-' && -+ (tmpstr[1] == 'I' || tmpstr[1] == 'L')) - { -- if (tmpstr[0] == '-' && -- (tmpstr[1] == 'I' || -- tmpstr[1] == 'L')) -- { - g_string_append_c (str, '-'); - g_string_append_c (str, tmpstr[1]); - g_string_append (str, pcsysrootdir); - g_string_append (str, tmpstr+2); -- } - } - else - { diff --git a/package/pkg-config/pkg-config.mk b/package/pkg-config/pkg-config.mk index d0bc42478..413853d97 100644 --- a/package/pkg-config/pkg-config.mk +++ b/package/pkg-config/pkg-config.mk @@ -3,7 +3,7 @@ # pkgconfig # ############################################################# -PKG_CONFIG_VERSION = 0.23 +PKG_CONFIG_VERSION = 0.25 PKG_CONFIG_SOURCE = pkg-config-$(PKG_CONFIG_VERSION).tar.gz PKG_CONFIG_SITE = http://pkgconfig.freedesktop.org/releases/ |