From d91a43228c5ba35335a28de278194df23dcdf978 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sun, 12 May 2013 23:58:54 -0700 Subject: 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. Signed-off-by: Saul Wold --- .../pkgconfig/pkgconfig-0.25/autofoo.patch | 528 --------------------- .../pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h | 6 - .../pkgconfig-0.25/obsolete_automake_macros.patch | 35 -- .../pkgconfig/pkgconfig-0.28/autofoo.patch | 528 +++++++++++++++++++++ .../fix-glib-configure-libtool-usage.patch | 45 ++ .../pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h | 6 + meta/recipes-devtools/pkgconfig/pkgconfig.inc | 6 +- .../pkgconfig/pkgconfig/disable-legacy.patch | 48 -- meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 13 - meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb | 10 + 10 files changed, 592 insertions(+), 633 deletions(-) delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.25/glibconfig-sysdefs.h delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig/disable-legacy.patch delete mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch deleted file mode 100644 index 9853577b58..0000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/autofoo.patch +++ /dev/null @@ -1,528 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - glib-1.2.10/acglib.m4 | 12 +- - glib-1.2.10/configure.in | 212 ++++++++++++++++++++++++++++++------------------ - 2 files changed, 140 insertions(+), 84 deletions(-) - -Index: pkg-config-0.23/glib-1.2.10/acglib.m4 -=================================================================== ---- pkg-config-0.23.orig/glib-1.2.10/acglib.m4 2008-01-16 22:52:24.000000000 +0000 -+++ pkg-config-0.23/glib-1.2.10/acglib.m4 2008-03-26 20:59:12.000000000 +0000 -@@ -10,7 +10,7 @@ - AC_DIVERT_POP()])])]) - - dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION]) --AC_DEFUN(GLIB_IF_VAR_EQ,[ -+AC_DEFUN([GLIB_IF_VAR_EQ],[ - case "$[$1]" in - "[$2]"[)] - [$3] -@@ -21,7 +21,7 @@ - esac - ]) - dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION]) --AC_DEFUN(GLIB_STR_CONTAINS,[ -+AC_DEFUN([GLIB_STR_CONTAINS],[ - case "[$1]" in - *"[$2]"*[)] - [$3] -@@ -32,12 +32,12 @@ - esac - ]) - dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING) --AC_DEFUN(GLIB_ADD_TO_VAR,[ -+AC_DEFUN([GLIB_ADD_TO_VAR],[ - GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]") - ]) - - dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE]) --AC_DEFUN(GLIB_SIZEOF, -+AC_DEFUN([GLIB_SIZEOF], - [changequote(<<, >>)dnl - dnl The name to #define. - define(<>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl -@@ -62,7 +62,7 @@ - ]) - - dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER) --AC_DEFUN(GLIB_BYTE_CONTENTS, -+AC_DEFUN([GLIB_BYTE_CONTENTS], - [changequote(<<, >>)dnl - dnl The name to #define. - define(<>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl -@@ -92,7 +92,7 @@ - ]) - - dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX]) --AC_DEFUN(GLIB_SYSDEFS, -+AC_DEFUN([GLIB_SYSDEFS], - [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])" - glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'` - if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then -Index: pkg-config-0.23/glib-1.2.10/configure.in -=================================================================== ---- pkg-config-0.23.orig/glib-1.2.10/configure.in 2008-01-16 22:52:24.000000000 +0000 -+++ pkg-config-0.23/glib-1.2.10/configure.in 2008-03-26 20:59:12.000000000 +0000 -@@ -1,10 +1,11 @@ - dnl *********************************** - dnl *** include special GLib macros *** - dnl *********************************** --builtin(include, acglib.m4)dnl -+dnl no need, just use aclocal -I . --CL -+dnl builtin(include, acglib.m4)dnl - - # require autoconf 2.13 --AC_PREREQ(2.13) -+AC_PREREQ(2.53) - - # init autoconf (and check for presence of glist.c) - AC_INIT(glist.c) -@@ -13,11 +14,48 @@ - cflags_set=${CFLAGS+set} - - # we rewrite this file -+if test "x$cross_compiling" != "xyes"; then - rm -f glibconfig-sysdefs.h -+fi -+ -+# config defines -+ -+AH_TEMPLATE([ENABLE_MEM_CHECK], -+ [Define if enabling memory checking]) -+AH_TEMPLATE([ENABLE_MEM_PROFILE], []) -+AH_TEMPLATE([GLIB_BINARY_AGE], []) -+AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], []) -+AH_TEMPLATE([GLIB_INTERFACE_AGE], []) -+AH_TEMPLATE([GLIB_MAJOR_VERSION], []) -+AH_TEMPLATE([GLIB_MINOR_VERSION], []) -+AH_TEMPLATE([GLIB_MICRO_VERSION], []) -+AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], []) -+AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], []) -+AH_TEMPLATE([G_HAVE_INLINE], []) -+AH_TEMPLATE([G_HAVE___INLINE], []) -+AH_TEMPLATE([G_HAVE___INLINE__], []) -+AH_TEMPLATE([G_THREAD_SOURCE], []) -+AH_TEMPLATE([G_VA_COPY], []) -+AH_TEMPLATE([G_VA_COPY_AS_ARRAY], []) -+AH_TEMPLATE([HAVE_BROKEN_WCTYPE], []) -+AH_TEMPLATE([HAVE_GETPWUID_R], []) -+AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], []) -+AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], []) -+AH_TEMPLATE([HAVE_WCHAR_H], []) -+AH_TEMPLATE([HAVE_WCTYPE_H], []) -+AH_TEMPLATE([NO_FD_SET], []) -+AH_TEMPLATE([NO_SYS_ERRLIST], []) -+AH_TEMPLATE([NO_SYS_SIGLIST], []) -+AH_TEMPLATE([NO_SYS_SIGLIST_DECL], []) -+AH_TEMPLATE([REALLOC_0_WORKS], []) -+ - - dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they - dnl are available for $ac_help expansion (don't we all *love* autoconf?) --GLIB_AC_DIVERT_BEFORE_HELP([ -+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE) -+#dnl - # - # The following version number definitions apply to GLib, GModule and GThread - # as a whole, so if changes occoured in any of them, they are all -@@ -38,7 +76,7 @@ - GLIB_BINARY_AGE=10 - GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION - dnl --]) -+#AC_DIVERT_POP()dnl - - AC_SUBST(GLIB_MAJOR_VERSION) - AC_SUBST(GLIB_MINOR_VERSION) -@@ -72,22 +110,20 @@ - AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE) - - dnl Initialize libtool --AC_PROG_LIBTOOL -+AM_PROG_LIBTOOL - - dnl Initialize maintainer mode - AM_MAINTAINER_MODE - --AC_CANONICAL_HOST -- - dnl figure debugging default, prior to $ac_help setup - dnl --GLIB_AC_DIVERT_BEFORE_HELP([ -+#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl - if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then - debug_default=yes - else - debug_default=minimum - fi --]) dnl -+#AC_DIVERT_POP()dnl - - dnl declare --enable-* args and collect ac_help strings - AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) -@@ -194,7 +230,9 @@ - CFLAGS=$glib_save_CFLAGS - AC_MSG_WARN( - [No ANSI prototypes found in library. (-std1 didn't work.)]) -+ , AC_MSG_WARN([Skipping test due to crosscompilation]) - ) -+ , AC_MSG_WARN([Skipping test due to crosscompilation]) - ) - LIBS=$glib_save_LIBS - -@@ -336,7 +374,7 @@ - if test $gtk_ok = yes; then - AC_MSG_RESULT([yes, found in sys/types.h]) - else -- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes) -+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) - if test $gtk_ok = yes; then - AC_DEFINE(HAVE_SYS_SELECT_H) - AC_MSG_RESULT([yes, found in sys/select.h]) -@@ -409,7 +447,7 @@ - glib_cv_sane_realloc=no - ,) - ]) --if test x$glib_cv_sane_realloc = xyes; then -+if test "x$glib_cv_sane_realloc" = "xyes"; then - AC_DEFINE(REALLOC_0_WORKS) - fi - AC_MSG_RESULT($glib_cv_sane_realloc) -@@ -487,7 +525,8 @@ - ]) - if test "x$glib_cv_va_copy" = "xyes"; then - AC_DEFINE(G_VA_COPY, va_copy) --else if test "x$glib_cv___va_copy" = "xyes"; then -+else -+if test "x$glib_cv___va_copy" = "xyes"; then - AC_DEFINE(G_VA_COPY, __va_copy) - fi - fi -@@ -496,6 +535,7 @@ - fi - AC_MSG_RESULT($glib_cv_va_val_copy) - -+AC_MSG_WARN([hi mom]) - - dnl *********************** - dnl *** g_module checks *** -@@ -507,23 +547,27 @@ - G_MODULE_BROKEN_RTLD_GLOBAL=0 - G_MODULE_HAVE_DLERROR=0 - dnl *** dlopen() and dlsym() in system libraries -+AC_CHECK_FUNC(dlopen,[ -+ AC_CHECK_FUNC(dlsym,[ -+ G_MODULE_IMPL=G_MODULE_IMPL_DL -+ ], -+ )], -+) - if test -z "$G_MODULE_IMPL"; then -- AC_CHECK_FUNC(dlopen, -- [AC_CHECK_FUNC(dlsym, -+ AC_CHECK_FUNC(dlopen,[ -+ AC_CHECK_FUNC(dlsym,[ - G_MODULE_IMPL=G_MODULE_IMPL_DL -- ,)] -- ,) -- -+ ])], -+ ) - fi -- - dnl *** dlopen() and dlsym() in libdl - if test -z "$G_MODULE_IMPL"; then -- AC_CHECK_LIB(dl, dlopen, -- [AC_CHECK_LIB(dl, dlsym, -+ AC_CHECK_LIB(dl, dlopen,[ -+ AC_CHECK_LIB(dl, dlsym,[ - G_MODULE_LIBS=-ldl - G_MODULE_IMPL=G_MODULE_IMPL_DL -- ,)] -- ,) -+ ])] -+ ) - fi - dnl *** shl_load() in libdld (HP-UX) - if test -z "$G_MODULE_IMPL"; then -@@ -633,6 +677,7 @@ - AC_SUBST(G_MODULE_NEED_USCORE) - AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL) - AC_SUBST(GLIB_DEBUG_FLAGS) -+AC_MSG_WARN([hi mom]) - - - dnl *********************** -@@ -869,40 +914,50 @@ - fi - if test x"$have_threads" = xposix; then - LIBS="$LIBS $G_THREAD_LIBS" -- AC_MSG_CHECKING(whether pthread_getspecific is posix like) - # PCThreads has pthread_getspecific(pthread_key_t, void **); -- AC_TRY_COMPILE([#include ], -- [pthread_getspecific(0,NULL);], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)]) -- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like) -+ AC_CACHE_CHECK([whether pthread_getspecific is posix like], -+ [glib_cv_sys_pthread_getspecific_posix], -+ AC_TRY_COMPILE([#include ], -+ [pthread_getspecific(0,NULL);], -+ [glib_cv_sys_pthread_getspecific_posix=no], -+ [glib_cv_sys_pthread_getspecific_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX) -+ fi - # DCE Threads return 1 as success, posix 0. what a mess. -- AC_TRY_RUN([#include -- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -- int main () { -- return !pthread_mutex_trylock (&mutex); }], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)]) -- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like) -+ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like], -+ [glib_cv_sys_pthread_mutex_trylock_posix], -+ AC_TRY_RUN([#include -+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -+ int main () { -+ return !pthread_mutex_trylock (&mutex); }], -+ [glib_cv_sys_pthread_mutex_trylock_posix=no], -+ [glib_cv_sys_pthread_mutex_trylock_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX) -+ fi - # DCE Threads return -1 as failure, posix ETIMEDOUT. -- AC_TRY_RUN([#include -- #include -- int main () { -- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -- pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -- struct timeval tval; -- struct timespec tspec; -- gettimeofday (&tval, NULL); -- tspec.tv_sec = tval.tv_sec; -- tspec.tv_nsec = 0; -- pthread_mutex_lock (&mutex); -- return pthread_cond_timedwait (&cond,&mutex,&tspec) -- != -1;}], -- [AC_MSG_RESULT(no)], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)]) -+ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like], -+ [glib_cv_sys_pthread_cond_timedwait_posix], -+ AC_TRY_RUN([#include -+ int main () { -+ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -+ pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -+ struct timeval tval; -+ struct timespec tspec; -+ gettimeofday (&tval, NULL); -+ tspec.tv_sec = tval.tv_sec; -+ tspec.tv_nsec = 0; -+ return pthread_cond_timedwait (&cond,&mutex,&tspec) -+ != -1;}], -+ [glib_cv_sys_pthread_cond_timedwait_posix=no], -+ [glib_cv_sys_pthread_cond_timedwait_posix=yes]) -+ ) -+ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then -+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX) -+ fi - fi - LIBS="$glib_save_LIBS" - CFLAGS="$glib_save_CFLAGS" -@@ -946,13 +1001,14 @@ - dnl **************************************** - dnl *** GLib POLL* compatibility defines *** - dnl **************************************** -+if test x"$cross_compiling" != xyes; then - GLIB_SYSDEFS( - [#include - #include ], - POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32, - glibconfig-sysdefs.h, - =) -- -+fi - - dnl ****************************** - dnl *** output the whole stuff *** -@@ -1005,7 +1061,7 @@ - echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile - fi - -- cat >> $outfile <<_______EOF -+ cat >> $outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile - fi - - - -- cat >>$outfile <<_______EOF -+ cat >>$outfile <>$outfile - if test x$g_mutex_has_default = xyes; then -- cat >>$outfile <<_______EOF -+ cat >>$outfile <aligned_pad_u)) : \ - g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex))) --_______EOF -+EOF - else -- cat >>$outfile <<_______EOF -+ cat >>$outfile <>$outfile -@@ -1126,15 +1182,15 @@ - g_bit_sizes="$g_bit_sizes 64" - fi - for bits in $g_bit_sizes; do -- cat >>$outfile <<_______EOF -+ cat >>$outfile <>$outfile <<_______EOF -+ cat >>$outfile <>$outfile - fi - - -- cat >>$outfile <<_______EOF -+ cat >>$outfile < -diff -Nurd pkg-config-0.25/configure.in pkg-config-0.25/configure.in ---- pkg-config-0.25/configure.in 2010-05-28 18:55:09.000000000 +0300 -+++ pkg-config-0.25/configure.in 2013-01-01 22:13:47.009573426 +0200 -@@ -4,7 +4,7 @@ - AM_INIT_AUTOMAKE(pkg-config, 0.25) - AM_MAINTAINER_MODE - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AM_PROG_LIBTOOL - -diff -Nurd pkg-config-0.25/glib-1.2.10/configure.in pkg-config-0.25/glib-1.2.10/configure.in ---- pkg-config-0.25/glib-1.2.10/configure.in 2009-12-06 22:43:59.000000000 +0200 -+++ pkg-config-0.25/glib-1.2.10/configure.in 2013-01-01 22:23:36.701560486 +0200 -@@ -63,7 +63,7 @@ - AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) - - # Specify a configuration file --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION) - AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION) -@@ -154,7 +154,6 @@ - - # Checks for programs. - AC_PROG_CC --AM_PROG_CC_STDC - AC_PROG_INSTALL - - changequote(,)dnl diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch new file mode 100644 index 0000000000..9853577b58 --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/autofoo.patch @@ -0,0 +1,528 @@ +Upstream-Status: Inappropriate [configuration] + +--- + glib-1.2.10/acglib.m4 | 12 +- + glib-1.2.10/configure.in | 212 ++++++++++++++++++++++++++++++------------------ + 2 files changed, 140 insertions(+), 84 deletions(-) + +Index: pkg-config-0.23/glib-1.2.10/acglib.m4 +=================================================================== +--- pkg-config-0.23.orig/glib-1.2.10/acglib.m4 2008-01-16 22:52:24.000000000 +0000 ++++ pkg-config-0.23/glib-1.2.10/acglib.m4 2008-03-26 20:59:12.000000000 +0000 +@@ -10,7 +10,7 @@ + AC_DIVERT_POP()])])]) + + dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION]) +-AC_DEFUN(GLIB_IF_VAR_EQ,[ ++AC_DEFUN([GLIB_IF_VAR_EQ],[ + case "$[$1]" in + "[$2]"[)] + [$3] +@@ -21,7 +21,7 @@ + esac + ]) + dnl GLIB_STR_CONTAINS (SRC_STRING, SUB_STRING [, CONTAINS_ACTION] [, ELSE_ACTION]) +-AC_DEFUN(GLIB_STR_CONTAINS,[ ++AC_DEFUN([GLIB_STR_CONTAINS],[ + case "[$1]" in + *"[$2]"*[)] + [$3] +@@ -32,12 +32,12 @@ + esac + ]) + dnl GLIB_ADD_TO_VAR (ENV_VARIABLE, CHECK_STRING, ADD_STRING) +-AC_DEFUN(GLIB_ADD_TO_VAR,[ ++AC_DEFUN([GLIB_ADD_TO_VAR],[ + GLIB_STR_CONTAINS($[$1], [$2], [$1]="$[$1]", [$1]="$[$1] [$3]") + ]) + + dnl GLIB_SIZEOF (INCLUDES, TYPE, ALIAS [, CROSS-SIZE]) +-AC_DEFUN(GLIB_SIZEOF, ++AC_DEFUN([GLIB_SIZEOF], + [changequote(<<, >>)dnl + dnl The name to #define. + define(<>, translit(glib_sizeof_$3, [a-z *], [A-Z_P]))dnl +@@ -62,7 +62,7 @@ + ]) + + dnl GLIB_BYTE_CONTENTS (INCLUDES, TYPE, ALIAS, N_BYTES, INITIALIZER) +-AC_DEFUN(GLIB_BYTE_CONTENTS, ++AC_DEFUN([GLIB_BYTE_CONTENTS], + [changequote(<<, >>)dnl + dnl The name to #define. + define(<>, translit(glib_byte_contents_$3, [a-z *], [A-Z_P]))dnl +@@ -92,7 +92,7 @@ + ]) + + dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX]) +-AC_DEFUN(GLIB_SYSDEFS, ++AC_DEFUN([GLIB_SYSDEFS], + [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])" + glib_sysdef_msg=`echo $2 | sed 's/:[[^ ]]*//g'` + if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then +Index: pkg-config-0.23/glib-1.2.10/configure.in +=================================================================== +--- pkg-config-0.23.orig/glib-1.2.10/configure.in 2008-01-16 22:52:24.000000000 +0000 ++++ pkg-config-0.23/glib-1.2.10/configure.in 2008-03-26 20:59:12.000000000 +0000 +@@ -1,10 +1,11 @@ + dnl *********************************** + dnl *** include special GLib macros *** + dnl *********************************** +-builtin(include, acglib.m4)dnl ++dnl no need, just use aclocal -I . --CL ++dnl builtin(include, acglib.m4)dnl + + # require autoconf 2.13 +-AC_PREREQ(2.13) ++AC_PREREQ(2.53) + + # init autoconf (and check for presence of glist.c) + AC_INIT(glist.c) +@@ -13,11 +14,48 @@ + cflags_set=${CFLAGS+set} + + # we rewrite this file ++if test "x$cross_compiling" != "xyes"; then + rm -f glibconfig-sysdefs.h ++fi ++ ++# config defines ++ ++AH_TEMPLATE([ENABLE_MEM_CHECK], ++ [Define if enabling memory checking]) ++AH_TEMPLATE([ENABLE_MEM_PROFILE], []) ++AH_TEMPLATE([GLIB_BINARY_AGE], []) ++AH_TEMPLATE([GLIB_BYTE_CONTENTS_GMUTEX], []) ++AH_TEMPLATE([GLIB_INTERFACE_AGE], []) ++AH_TEMPLATE([GLIB_MAJOR_VERSION], []) ++AH_TEMPLATE([GLIB_MINOR_VERSION], []) ++AH_TEMPLATE([GLIB_MICRO_VERSION], []) ++AH_TEMPLATE([GLIB_SIZEOF_GMUTEX], []) ++AH_TEMPLATE([G_COMPILED_WITH_DEBUGGING], []) ++AH_TEMPLATE([G_HAVE_INLINE], []) ++AH_TEMPLATE([G_HAVE___INLINE], []) ++AH_TEMPLATE([G_HAVE___INLINE__], []) ++AH_TEMPLATE([G_THREAD_SOURCE], []) ++AH_TEMPLATE([G_VA_COPY], []) ++AH_TEMPLATE([G_VA_COPY_AS_ARRAY], []) ++AH_TEMPLATE([HAVE_BROKEN_WCTYPE], []) ++AH_TEMPLATE([HAVE_GETPWUID_R], []) ++AH_TEMPLATE([HAVE_GETPWUID_R_POSIX], []) ++AH_TEMPLATE([HAVE_PTHREAD_COND_TIMEDWAIT_POSIX], []) ++AH_TEMPLATE([HAVE_PTHREAD_GETSPECIFIC_POSIX], []) ++AH_TEMPLATE([HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX], []) ++AH_TEMPLATE([HAVE_WCHAR_H], []) ++AH_TEMPLATE([HAVE_WCTYPE_H], []) ++AH_TEMPLATE([NO_FD_SET], []) ++AH_TEMPLATE([NO_SYS_ERRLIST], []) ++AH_TEMPLATE([NO_SYS_SIGLIST], []) ++AH_TEMPLATE([NO_SYS_SIGLIST_DECL], []) ++AH_TEMPLATE([REALLOC_0_WORKS], []) ++ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-GLIB_AC_DIVERT_BEFORE_HELP([ ++#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE) ++#dnl + # + # The following version number definitions apply to GLib, GModule and GThread + # as a whole, so if changes occoured in any of them, they are all +@@ -38,7 +76,7 @@ + GLIB_BINARY_AGE=10 + GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION + dnl +-]) ++#AC_DIVERT_POP()dnl + + AC_SUBST(GLIB_MAJOR_VERSION) + AC_SUBST(GLIB_MINOR_VERSION) +@@ -72,22 +110,20 @@ + AC_DEFINE_UNQUOTED(GLIB_BINARY_AGE, $GLIB_BINARY_AGE) + + dnl Initialize libtool +-AC_PROG_LIBTOOL ++AM_PROG_LIBTOOL + + dnl Initialize maintainer mode + AM_MAINTAINER_MODE + +-AC_CANONICAL_HOST +- + dnl figure debugging default, prior to $ac_help setup + dnl +-GLIB_AC_DIVERT_BEFORE_HELP([ ++#AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl + if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else + debug_default=minimum + fi +-]) dnl ++#AC_DIVERT_POP()dnl + + dnl declare --enable-* args and collect ac_help strings + AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) +@@ -194,7 +230,9 @@ + CFLAGS=$glib_save_CFLAGS + AC_MSG_WARN( + [No ANSI prototypes found in library. (-std1 didn't work.)]) ++ , AC_MSG_WARN([Skipping test due to crosscompilation]) + ) ++ , AC_MSG_WARN([Skipping test due to crosscompilation]) + ) + LIBS=$glib_save_LIBS + +@@ -336,7 +374,7 @@ + if test $gtk_ok = yes; then + AC_MSG_RESULT([yes, found in sys/types.h]) + else +- AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes) ++ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) + if test $gtk_ok = yes; then + AC_DEFINE(HAVE_SYS_SELECT_H) + AC_MSG_RESULT([yes, found in sys/select.h]) +@@ -409,7 +447,7 @@ + glib_cv_sane_realloc=no + ,) + ]) +-if test x$glib_cv_sane_realloc = xyes; then ++if test "x$glib_cv_sane_realloc" = "xyes"; then + AC_DEFINE(REALLOC_0_WORKS) + fi + AC_MSG_RESULT($glib_cv_sane_realloc) +@@ -487,7 +525,8 @@ + ]) + if test "x$glib_cv_va_copy" = "xyes"; then + AC_DEFINE(G_VA_COPY, va_copy) +-else if test "x$glib_cv___va_copy" = "xyes"; then ++else ++if test "x$glib_cv___va_copy" = "xyes"; then + AC_DEFINE(G_VA_COPY, __va_copy) + fi + fi +@@ -496,6 +535,7 @@ + fi + AC_MSG_RESULT($glib_cv_va_val_copy) + ++AC_MSG_WARN([hi mom]) + + dnl *********************** + dnl *** g_module checks *** +@@ -507,23 +547,27 @@ + G_MODULE_BROKEN_RTLD_GLOBAL=0 + G_MODULE_HAVE_DLERROR=0 + dnl *** dlopen() and dlsym() in system libraries ++AC_CHECK_FUNC(dlopen,[ ++ AC_CHECK_FUNC(dlsym,[ ++ G_MODULE_IMPL=G_MODULE_IMPL_DL ++ ], ++ )], ++) + if test -z "$G_MODULE_IMPL"; then +- AC_CHECK_FUNC(dlopen, +- [AC_CHECK_FUNC(dlsym, ++ AC_CHECK_FUNC(dlopen,[ ++ AC_CHECK_FUNC(dlsym,[ + G_MODULE_IMPL=G_MODULE_IMPL_DL +- ,)] +- ,) +- ++ ])], ++ ) + fi +- + dnl *** dlopen() and dlsym() in libdl + if test -z "$G_MODULE_IMPL"; then +- AC_CHECK_LIB(dl, dlopen, +- [AC_CHECK_LIB(dl, dlsym, ++ AC_CHECK_LIB(dl, dlopen,[ ++ AC_CHECK_LIB(dl, dlsym,[ + G_MODULE_LIBS=-ldl + G_MODULE_IMPL=G_MODULE_IMPL_DL +- ,)] +- ,) ++ ])] ++ ) + fi + dnl *** shl_load() in libdld (HP-UX) + if test -z "$G_MODULE_IMPL"; then +@@ -633,6 +677,7 @@ + AC_SUBST(G_MODULE_NEED_USCORE) + AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL) + AC_SUBST(GLIB_DEBUG_FLAGS) ++AC_MSG_WARN([hi mom]) + + + dnl *********************** +@@ -869,40 +914,50 @@ + fi + if test x"$have_threads" = xposix; then + LIBS="$LIBS $G_THREAD_LIBS" +- AC_MSG_CHECKING(whether pthread_getspecific is posix like) + # PCThreads has pthread_getspecific(pthread_key_t, void **); +- AC_TRY_COMPILE([#include ], +- [pthread_getspecific(0,NULL);], +- [AC_MSG_RESULT(no)], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX)]) +- AC_MSG_CHECKING(whether pthread_mutex_trylock is posix like) ++ AC_CACHE_CHECK([whether pthread_getspecific is posix like], ++ [glib_cv_sys_pthread_getspecific_posix], ++ AC_TRY_COMPILE([#include ], ++ [pthread_getspecific(0,NULL);], ++ [glib_cv_sys_pthread_getspecific_posix=no], ++ [glib_cv_sys_pthread_getspecific_posix=yes]) ++ ) ++ if test x"$glib_cv_sys_pthread_getspecific_posix" = xyes; then ++ AC_DEFINE(HAVE_PTHREAD_GETSPECIFIC_POSIX) ++ fi + # DCE Threads return 1 as success, posix 0. what a mess. +- AC_TRY_RUN([#include +- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +- int main () { +- return !pthread_mutex_trylock (&mutex); }], +- [AC_MSG_RESULT(no)], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX)]) +- AC_MSG_CHECKING(whether pthread_cond_timedwait is posix like) ++ AC_CACHE_CHECK([whether pthread_mutex_trylock is posix like], ++ [glib_cv_sys_pthread_mutex_trylock_posix], ++ AC_TRY_RUN([#include ++ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ int main () { ++ return !pthread_mutex_trylock (&mutex); }], ++ [glib_cv_sys_pthread_mutex_trylock_posix=no], ++ [glib_cv_sys_pthread_mutex_trylock_posix=yes]) ++ ) ++ if test x"$glib_cv_sys_pthread_mutex_trylock_posix" = xyes; then ++ AC_DEFINE(HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX) ++ fi + # DCE Threads return -1 as failure, posix ETIMEDOUT. +- AC_TRY_RUN([#include +- #include +- int main () { +- pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +- pthread_cond_t cond = PTHREAD_COND_INITIALIZER; +- struct timeval tval; +- struct timespec tspec; +- gettimeofday (&tval, NULL); +- tspec.tv_sec = tval.tv_sec; +- tspec.tv_nsec = 0; +- pthread_mutex_lock (&mutex); +- return pthread_cond_timedwait (&cond,&mutex,&tspec) +- != -1;}], +- [AC_MSG_RESULT(no)], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX)]) ++ AC_CACHE_CHECK([whether pthread_cond_timedwait is posix like], ++ [glib_cv_sys_pthread_cond_timedwait_posix], ++ AC_TRY_RUN([#include ++ int main () { ++ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ++ pthread_cond_t cond = PTHREAD_COND_INITIALIZER; ++ struct timeval tval; ++ struct timespec tspec; ++ gettimeofday (&tval, NULL); ++ tspec.tv_sec = tval.tv_sec; ++ tspec.tv_nsec = 0; ++ return pthread_cond_timedwait (&cond,&mutex,&tspec) ++ != -1;}], ++ [glib_cv_sys_pthread_cond_timedwait_posix=no], ++ [glib_cv_sys_pthread_cond_timedwait_posix=yes]) ++ ) ++ if test x"$glib_cv_sys_pthread_cond_timedwait_posix" = xyes; then ++ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_POSIX) ++ fi + fi + LIBS="$glib_save_LIBS" + CFLAGS="$glib_save_CFLAGS" +@@ -946,13 +1001,14 @@ + dnl **************************************** + dnl *** GLib POLL* compatibility defines *** + dnl **************************************** ++if test x"$cross_compiling" != xyes; then + GLIB_SYSDEFS( + [#include + #include ], + POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32, + glibconfig-sysdefs.h, + =) +- ++fi + + dnl ****************************** + dnl *** output the whole stuff *** +@@ -1005,7 +1061,7 @@ + echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile + fi + +- cat >> $outfile <<_______EOF ++ cat >> $outfile <>$outfile <<_______EOF ++ cat >>$outfile <>$outfile <<_______EOF ++ cat >>$outfile <>$outfile <<_______EOF ++ cat >>$outfile <>$outfile <<_______EOF ++ cat >>$outfile <>$outfile <<_______EOF ++ cat >>$outfile <>$outfile + fi + + + +- cat >>$outfile <<_______EOF ++ cat >>$outfile <>$outfile + if test x$g_mutex_has_default = xyes; then +- cat >>$outfile <<_______EOF ++ cat >>$outfile <aligned_pad_u)) : \ + g_static_mutex_get_mutex_impl (&((mutex)->runtime_mutex))) +-_______EOF ++EOF + else +- cat >>$outfile <<_______EOF ++ cat >>$outfile <>$outfile +@@ -1126,15 +1182,15 @@ + g_bit_sizes="$g_bit_sizes 64" + fi + for bits in $g_bit_sizes; do +- cat >>$outfile <<_______EOF ++ cat >>$outfile <>$outfile <<_______EOF ++ cat >>$outfile <>$outfile + fi + + +- cat >>$outfile <<_______EOF ++ cat >>$outfile < + + +Index: pkg-config-0.28/glib/configure.ac +=================================================================== +--- pkg-config-0.28.orig/glib/configure.ac ++++ pkg-config-0.28/glib/configure.ac +@@ -1438,7 +1438,7 @@ if test x"$glib_native_win32" = xyes; th + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./${host_alias}-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1503,13 +1503,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./${host_alias}-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ + ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 +- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./${host_alias}-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ + ${LDFLAGS} -module -o plugin.la -export-dynamic \ + -shrext ".o" -avoid-version plugin.lo \ + -rpath /dont/care >/dev/null 2>&1 +- eval `./libtool --config | grep ^objdir` ++ eval `./${host_alias}-libtool --config | grep ^objdir` + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ + AC_TRY_RUN([ +@@ -1582,7 +1582,7 @@ fi + + AC_MSG_CHECKING(for the suffix of module shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`./${host_alias}-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h new file mode 100644 index 0000000000..1329e7f21c --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/glibconfig-sysdefs.h @@ -0,0 +1,6 @@ +#define GLIB_SYSDEF_POLLIN =1 +#define GLIB_SYSDEF_POLLOUT =4 +#define GLIB_SYSDEF_POLLPRI =2 +#define GLIB_SYSDEF_POLLERR =8 +#define GLIB_SYSDEF_POLLHUP =16 +#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc index 52b9ad1e75..3e655a93e2 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc @@ -18,9 +18,9 @@ S = "${WORKDIR}/pkg-config-${PV}/" inherit autotools -EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts" -EXTRA_OECONF_class-native = "--disable-legacy-scripts" -EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts" +EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts --with-internal-glib" +EXTRA_OECONF_class-native = "--disable-legacy-scripts --with-internal-glib" +EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts --with-internal-glib" acpaths = "-I ." do_configure_prepend () { 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 @@ -Upstream-Status: Inappropriate [configuration] - -On an Fedora host with glib-config installed pkgconfig-native can get into a -horrible state with recursive calls between pkg-config and glib-config. -The patch adds a configure time option to disable legacy script support in -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.25/configure.in -=================================================================== ---- 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, -+ [AC_HELP_STRING([--enable-legacy-scripts=@<:@no/yes@:>@], -+ [Whether pkg-config will try and use legacy scripts such as glib-config and gnome-config @<:@default=yes@:>@])], -+ [], -+ [enable_legacy=yes]) -+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.25/parse.c -=================================================================== ---- 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(NO_LEGACY_SCRIPTS) -+ /* There are scenarios where we might not want to use these legacy -+ * scripts even if they are available. -+ */ -+ return NULL; - #else - - Package *pkg; diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb deleted file mode 100644 index a55d017581..0000000000 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb +++ /dev/null @@ -1,13 +0,0 @@ -require pkgconfig.inc - -PR = "r7" - -SRC_URI += "file://autofoo.patch \ - file://glibconfig-sysdefs.h \ - file://pkg-config-native.in \ - file://disable-legacy.patch \ - file://obsolete_automake_macros.patch \ - " - -SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" -SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb new file mode 100644 index 0000000000..99bb47f42d --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.28.bb @@ -0,0 +1,10 @@ +require pkgconfig.inc + +SRC_URI += " \ + file://glibconfig-sysdefs.h \ + file://pkg-config-native.in \ + file://fix-glib-configure-libtool-usage.patch \ + " + +SRC_URI[md5sum] = "aa3c86e67551adc3ac865160e34a2a0d" +SRC_URI[sha256sum] = "6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845" -- cgit v1.2.3