summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-05-12 23:58:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-16 00:09:47 +0300
commitc50b1fb4754f213c79c7d0862eb275fa67fc27b6 (patch)
tree9b547c0c58134094453fe365569007bc4ad39d6e /meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
parentf5b103ff47d6137326618328fa5803f0963e50f4 (diff)
downloadpoky-c50b1fb4754f213c79c7d0862eb275fa67fc27b6.tar.gz
pkgconfig: Update to 0.28
Remove older patches that have been fixed upstream, added new patch to use the correct alias-libtool instead of ./libtool. pkgconfig provides an internal glib library, so use it to avoid ciruclar dependecny issues. (From OE-Core rev: d91a43228c5ba35335a28de278194df23dcdf978) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
deleted file mode 100644
index 30db36c182..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3On an Fedora host with glib-config installed pkgconfig-native can get into a
4horrible state with recursive calls between pkg-config and glib-config.
5The patch adds a configure time option to disable legacy script support in
6pkgconfig with the --disable-legacy-scripts option, to maintain compatibility
7the default is to leave the scripts enabled.
8
9JL - 22/06/10
10Index: pkg-config-0.25/configure.in
11===================================================================
12--- pkg-config-0.25.orig/configure.in 2011-10-05 18:52:24.879726050 +0100
13+++ pkg-config-0.25/configure.in 2011-10-05 18:55:39.639726152 +0100
14@@ -151,6 +151,18 @@
15 AC_SUBST([POPT_LIBS])
16 AM_CONDITIONAL([USE_INSTALLED_POPT], [test "x$with_installed_popt" = xyes])
17
18+# legacy *-configure scripts can cause headaches, add option to disable
19+AC_ARG_ENABLE(legacy-scripts,
20+ [AC_HELP_STRING([--enable-legacy-scripts=@<:@no/yes@:>@],
21+ [Whether pkg-config will try and use legacy scripts such as glib-config and gnome-config @<:@default=yes@:>@])],
22+ [],
23+ [enable_legacy=yes])
24+AM_CONDITIONAL([NO_LEGACY_SCRIPTS], [test x$enable_legacy != xyes])
25+if test x$enable_legacy != xyes; then
26+ AC_DEFINE(NO_LEGACY_SCRIPTS, 1, [We are not using legacy scripts])
27+fi
28+
29+
30 AC_FUNC_ALLOCA
31
32 AC_CHECK_FUNCS(setresuid setreuid,break)
33Index: pkg-config-0.25/parse.c
34===================================================================
35--- pkg-config-0.25.orig/parse.c 2011-10-05 18:52:24.869726050 +0100
36+++ pkg-config-0.25/parse.c 2011-10-05 18:54:49.909726133 +0100
37@@ -1237,6 +1237,11 @@
38 * messages.
39 */
40 return NULL;
41+#elif defined(NO_LEGACY_SCRIPTS)
42+ /* There are scenarios where we might not want to use these legacy
43+ * scripts even if they are available.
44+ */
45+ return NULL;
46 #else
47
48 Package *pkg;