diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-05 18:59:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-07 11:26:05 +0100 |
| commit | aa816b0aaf39dc6f822114df0bd6d4dd62fce0b8 (patch) | |
| tree | 4c7c6e1d326d0110f6fd2ddd0e5bae1b7b97104c /meta/recipes-devtools | |
| parent | 4c95779fe1297b06adc705de30dca4e3570084ae (diff) | |
| download | openembedded-core-aa816b0aaf39dc6f822114df0bd6d4dd62fce0b8.tar.gz openembedded-core-aa816b0aaf39dc6f822114df0bd6d4dd62fce0b8.tar.bz2 openembedded-core-aa816b0aaf39dc6f822114df0bd6d4dd62fce0b8.zip | |
pkgconfig: Fix logic that was accidently leaving legacy pkg-config functionality enabled
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 2 |
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 the default is to leave the scripts enabled. JL - 22/06/10 -Index: pkg-config-0.23/configure.in +Index: pkg-config-0.25/configure.in =================================================================== ---- pkg-config-0.23.orig/configure.in 2008-01-16 22:48:07.000000000 +0000 -+++ pkg-config-0.23/configure.in 2010-06-22 13:05:58.951984140 +0100 -@@ -125,6 +125,14 @@ - AC_CONFIG_SUBDIRS(glib-1.2.10) - fi # !native_win32 +--- pkg-config-0.25.orig/configure.in 2011-10-05 18:52:24.879726050 +0100 ++++ pkg-config-0.25/configure.in 2011-10-05 18:55:39.639726152 +0100 +@@ -151,6 +151,18 @@ + AC_SUBST([POPT_LIBS]) + AM_CONDITIONAL([USE_INSTALLED_POPT], [test "x$with_installed_popt" = xyes]) +# legacy *-configure scripts can cause headaches, add option to disable +AC_ARG_ENABLE(legacy-scripts, @@ -21,20 +21,24 @@ Index: pkg-config-0.23/configure.in + [Whether pkg-config will try and use legacy scripts such as glib-config and gnome-config @<:@default=yes@:>@])], + [], + [enable_legacy=yes]) -+AM_CONDITIONAL([LEGACY_SCRIPTS], [test x$enable_legacy = xyes]) ++AM_CONDITIONAL([NO_LEGACY_SCRIPTS], [test x$enable_legacy != xyes]) ++if test x$enable_legacy != xyes; then ++ AC_DEFINE(NO_LEGACY_SCRIPTS, 1, [We are not using legacy scripts]) ++fi ++ + AC_FUNC_ALLOCA AC_CHECK_FUNCS(setresuid setreuid,break) -Index: pkg-config-0.23/parse.c +Index: pkg-config-0.25/parse.c =================================================================== ---- pkg-config-0.23.orig/parse.c 2008-01-16 20:42:49.000000000 +0000 -+++ pkg-config-0.23/parse.c 2010-06-22 13:09:10.410129471 +0100 -@@ -1195,6 +1195,11 @@ +--- pkg-config-0.25.orig/parse.c 2011-10-05 18:52:24.869726050 +0100 ++++ pkg-config-0.25/parse.c 2011-10-05 18:54:49.909726133 +0100 +@@ -1237,6 +1237,11 @@ * messages. */ return NULL; -+#elif defined(LEGACY_SCRIPTS) ++#elif defined(NO_LEGACY_SCRIPTS) + /* There are scenarios where we might not want to use these legacy + * scripts even if they are available. + */ 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 @@ require pkgconfig.inc -PR = "r0" +PR = "r2" SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" |