summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-05 18:59:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-07 11:35:50 +0100
commitc6776763b3497e5536787f90984a90dea639835f (patch)
tree84dfcf63682afb30863955e934b65cf7105e9997 /meta
parent318da9f6a4b3cd405f2a3ea3003082c78c47eeb2 (diff)
downloadpoky-c6776763b3497e5536787f90984a90dea639835f.tar.gz
pkgconfig: Fix logic that was accidently leaving legacy pkg-config functionality enabled
(From OE-Core rev: aa816b0aaf39dc6f822114df0bd6d4dd62fce0b8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch28
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb2
2 files changed, 17 insertions, 13 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
index 1b3c12a208..30db36c182 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch
@@ -7,13 +7,13 @@ pkgconfig with the --disable-legacy-scripts option, to maintain compatibility
7the default is to leave the scripts enabled. 7the default is to leave the scripts enabled.
8 8
9JL - 22/06/10 9JL - 22/06/10
10Index: pkg-config-0.23/configure.in 10Index: pkg-config-0.25/configure.in
11=================================================================== 11===================================================================
12--- pkg-config-0.23.orig/configure.in 2008-01-16 22:48:07.000000000 +0000 12--- pkg-config-0.25.orig/configure.in 2011-10-05 18:52:24.879726050 +0100
13+++ pkg-config-0.23/configure.in 2010-06-22 13:05:58.951984140 +0100 13+++ pkg-config-0.25/configure.in 2011-10-05 18:55:39.639726152 +0100
14@@ -125,6 +125,14 @@ 14@@ -151,6 +151,18 @@
15 AC_CONFIG_SUBDIRS(glib-1.2.10) 15 AC_SUBST([POPT_LIBS])
16 fi # !native_win32 16 AM_CONDITIONAL([USE_INSTALLED_POPT], [test "x$with_installed_popt" = xyes])
17 17
18+# legacy *-configure scripts can cause headaches, add option to disable 18+# legacy *-configure scripts can cause headaches, add option to disable
19+AC_ARG_ENABLE(legacy-scripts, 19+AC_ARG_ENABLE(legacy-scripts,
@@ -21,20 +21,24 @@ Index: pkg-config-0.23/configure.in
21+ [Whether pkg-config will try and use legacy scripts such as glib-config and gnome-config @<:@default=yes@:>@])], 21+ [Whether pkg-config will try and use legacy scripts such as glib-config and gnome-config @<:@default=yes@:>@])],
22+ [], 22+ [],
23+ [enable_legacy=yes]) 23+ [enable_legacy=yes])
24+AM_CONDITIONAL([LEGACY_SCRIPTS], [test x$enable_legacy = xyes]) 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+
25+ 29+
26 AC_FUNC_ALLOCA 30 AC_FUNC_ALLOCA
27 31
28 AC_CHECK_FUNCS(setresuid setreuid,break) 32 AC_CHECK_FUNCS(setresuid setreuid,break)
29Index: pkg-config-0.23/parse.c 33Index: pkg-config-0.25/parse.c
30=================================================================== 34===================================================================
31--- pkg-config-0.23.orig/parse.c 2008-01-16 20:42:49.000000000 +0000 35--- pkg-config-0.25.orig/parse.c 2011-10-05 18:52:24.869726050 +0100
32+++ pkg-config-0.23/parse.c 2010-06-22 13:09:10.410129471 +0100 36+++ pkg-config-0.25/parse.c 2011-10-05 18:54:49.909726133 +0100
33@@ -1195,6 +1195,11 @@ 37@@ -1237,6 +1237,11 @@
34 * messages. 38 * messages.
35 */ 39 */
36 return NULL; 40 return NULL;
37+#elif defined(LEGACY_SCRIPTS) 41+#elif defined(NO_LEGACY_SCRIPTS)
38+ /* There are scenarios where we might not want to use these legacy 42+ /* There are scenarios where we might not want to use these legacy
39+ * scripts even if they are available. 43+ * scripts even if they are available.
40+ */ 44+ */
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index a1f95083b3..76c0df916d 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@
1require pkgconfig.inc 1require pkgconfig.inc
2 2
3PR = "r0" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" 5SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
6SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" 6SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"