summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-01-29 21:06:28 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-01-29 21:06:28 (GMT)
commitd5da84fda9bf9478935e7a080491519ebc4197d3 (patch)
tree2c83a161774d9b12464690be899149f312637c89
parent50c93ed9b3d906b0e10c370431ca9e333053bdef (diff)
downloadbuildroot-d5da84fda9bf9478935e7a080491519ebc4197d3.tar.gz
buildroot-d5da84fda9bf9478935e7a080491519ebc4197d3.tar.bz2
pkg-config: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/pkg-config/pkg-config-0.23-fix-sysroot.patch34
-rw-r--r--package/pkg-config/pkg-config.mk2
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 3653811..0000000
--- 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 d0bc424..413853d 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/