jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg-config: update to pkg-config-0.29.2

Browse Source
This commit is contained in:
MilhouseVH 2017-05-06 21:16:56 +01:00
parent 6af902bf15
commit 739276c5c7
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/devel/pkg-config/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="pkg-config"
PKG_VERSION="0.29.1"
PKG_VERSION="0.29.2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.freedesktop.org/software/pkgconfig/"

34
packages/devel/pkg-config/patches/pkg-config-0001-use-sysroot-path.patch
View File

@ -1,23 +1,36 @@
diff -Naur a/pkg.c b/pkg.c
--- a/pkg.c 2016-02-26 17:56:52.000000000 +0100
+++ b/pkg.c 2017-01-02 19:48:34.000000000 +0100
@@ -468,11 +468,14 @@
From 35fe817168fe0bdb78777d2707ba0189a4ce19bc Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 5 May 2017 08:23:25 +0100
Subject: [PATCH] pkg-config: use sysroot path (see #1135)
---
pkg.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pkg.c b/pkg.c
index f29ecc7..a7a1f2a 100644
--- a/pkg.c
+++ b/pkg.c
@@ -433,7 +433,7 @@ flag_list_to_string (GList *list)
Flag *flag = tmp->data;
char *tmpstr = flag->arg;
- if (pcsysrootdir != NULL && flag->type & (CFLAGS_I | LIBS_L)) {
+ if (pcsysrootdir != NULL && flag->type & (CFLAGS_I | LIBS_L) && strncmp(tmpstr+2, pcsysrootdir, strlen(pcsysrootdir)) != 0) {
g_string_append_c (str, '-');
g_string_append_c (str, tmpstr[1]);
g_string_append (str, pcsysrootdir);
g_string_append (str, tmpstr+2);
/* Handle non-I Cflags like -isystem */
if (flag->type & CFLAGS_I && strncmp (tmpstr, "-I", 2) != 0) {
char *space = strchr (tmpstr, ' ');
@@ -449,6 +449,9 @@ flag_list_to_string (GList *list)
g_string_append (str, pcsysrootdir);
g_string_append (str, tmpstr+2);
}
+ } else if (pcsysrootdir != NULL && strncmp(tmpstr, "/usr", 4) == 0 && strncmp(tmpstr, pcsysrootdir, strlen(pcsysrootdir)) != 0) {
+ g_string_append (str, pcsysrootdir);
+ g_string_append (str, tmpstr);
} else {
g_string_append (str, tmpstr);
}
@@ -1087,6 +1090,8 @@
@@ -1060,6 +1063,8 @@ packages_get_var (GList *pkgs,
{
if (str->len > 0)
g_string_append_c (str, ' ');
@ -26,3 +39,6 @@ diff -Naur a/pkg.c b/pkg.c
g_string_append (str, var);
g_free (var);
}
--
2.7.4