From 5be3cd8d4e063ebe5db29ad0c753b40acd81052b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Mar 2008 20:51:47 +0000 Subject: pkgconfig: Update to 0.23, drop merged sysroot patch git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4122 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../pkgconfig/pkgconfig-0.22/autofoo.patch | 513 --------------------- .../pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h | 6 - .../pkgconfig/pkgconfig-0.22/sysroot-support.patch | 102 ---- 3 files changed, 621 deletions(-) delete mode 100644 meta/packages/pkgconfig/pkgconfig-0.22/autofoo.patch delete mode 100644 meta/packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h delete mode 100644 meta/packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch (limited to 'meta/packages/pkgconfig/pkgconfig-0.22') diff --git a/meta/packages/pkgconfig/pkgconfig-0.22/autofoo.patch b/meta/packages/pkgconfig/pkgconfig-0.22/autofoo.patch deleted file mode 100644 index 97293cee1..000000000 --- a/meta/packages/pkgconfig/pkgconfig-0.22/autofoo.patch +++ /dev/null @@ -1,513 +0,0 @@ ---- - glib-1.2.8/acglib.m4 | 12 +- - glib-1.2.8/configure.in | 212 ++++++++++++++++++++++++++++++------------------ - 2 files changed, 140 insertions(+), 84 deletions(-) - -Index: pkg-config-0.22/glib-1.2.8/acglib.m4 -=================================================================== ---- pkg-config-0.22.orig/glib-1.2.8/acglib.m4 2007-08-01 20:00:00.000000000 +0100 -+++ pkg-config-0.22/glib-1.2.8/acglib.m4 2007-08-01 20:11:08.000000000 +0100 -@@ -10,7 +10,7 @@ $1 - 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 @@ AC_DEFUN(GLIB_IF_VAR_EQ,[ - 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 @@ AC_DEFUN(GLIB_STR_CONTAINS,[ - 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 @@ undefine([AC_CV_NAME])dnl - ]) - - 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 @@ undefine([AC_CV_NAME])dnl - ]) - - 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.22/glib-1.2.8/configure.in -=================================================================== ---- pkg-config-0.22.orig/glib-1.2.8/configure.in 2007-08-01 18:03:34.000000000 +0100 -+++ pkg-config-0.22/glib-1.2.8/configure.in 2007-05-23 11:47:53.000000000 +0100 -@@ -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 @@ AC_INIT(glist.c) - 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_INTERFACE_AGE=8 - GLIB_BINARY_AGE=8 - 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_INTERFACE_AGE, $ - 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) -@@ -173,7 +209,9 @@ AC_TRY_RUN([#include - 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 - -@@ -315,7 +353,7 @@ AC_TRY_COMPILE([#include ], - 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]) -@@ -388,7 +426,7 @@ AC_CACHE_VAL(glib_cv_sane_realloc,[ - 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) -@@ -466,7 +504,8 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[ - ]) - 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 -@@ -475,6 +514,7 @@ if test "x$glib_cv_va_val_copy" = "xno"; - fi - AC_MSG_RESULT($glib_cv_va_val_copy) - -+AC_MSG_WARN([hi mom]) - - dnl *********************** - dnl *** g_module checks *** -@@ -485,23 +525,27 @@ dnl G_MODULE_IMPL= don't reset, so cmd-l - G_MODULE_NEED_USCORE=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 -@@ -580,6 +624,7 @@ AC_SUBST(G_MODULE_LDFLAGS) - AC_SUBST(G_MODULE_HAVE_DLERROR) - AC_SUBST(G_MODULE_NEED_USCORE) - AC_SUBST(GLIB_DEBUG_FLAGS) -+AC_MSG_WARN([hi mom]) - - - dnl *********************** -@@ -816,40 +861,50 @@ if test x"$have_threads" != xnone; then - 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" -@@ -893,13 +948,14 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes, - 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 *** -@@ -956,7 +1012,7 @@ _______EOF - 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 -@@ -1073,15 +1129,15 @@ _______EOF - 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 <data); -+ if (pcsysrootdir != NULL) -+ { -+ if (!strncmp(tmp->data,"-I",2) || -+ !strncmp(tmp->data,"-L",2)) -+ { -+ offset=2; -+ g_string_append_c (str,((char*)tmp->data)[0]); -+ g_string_append_c (str,((char*)tmp->data)[1]); -+ g_string_append (str,pcsysrootdir); -+ } -+ } -+ g_string_append (str, tmp->data+offset); - g_string_append_c (str, ' '); - - tmp = g_slist_next (tmp); -Index: pkg-config-0.22/pkg-config.1 -=================================================================== ---- pkg-config-0.22.orig/pkg-config.1 2007-09-14 10:20:15.000000000 +0100 -+++ pkg-config-0.22/pkg-config.1 2007-09-14 10:23:08.000000000 +0100 -@@ -260,6 +260,15 @@ Don't strip -I/usr/include out of cflags - Don't strip -L/usr/lib out of libs - - .TP -+.I "PKG_CONFIG_SYSROOT_DIR" -+Modify -I and -L to use the directories located in target sysroot. -+this option is usefull when crosscompiling package that use pkg-config -+to determine CFLAGS anf LDFLAGS. -I and -L are modified to point to -+the new system root. this means that a -I/usr/include/libfoo will -+become -I/var/target/usr/include/libfoo with a PKG_CONFIG_SYSROOT_DIR -+equal to /var/target (same rule apply to -L) -+ -+.TP - .I "PKG_CONFIG_LIBDIR" - Replaces the default \fIpkg-config\fP search directory. - -Index: pkg-config-0.22/pkg.h -=================================================================== ---- pkg-config-0.22.orig/pkg.h 2007-09-14 10:20:15.000000000 +0100 -+++ pkg-config-0.22/pkg.h 2007-09-14 10:22:41.000000000 +0100 -@@ -123,6 +123,9 @@ void disable_private_libs(void); - /* If TRUE, do not automatically prefer uninstalled versions */ - extern gboolean disable_uninstalled; - -+/* string that contain environment */ -+extern char* pcsysrootdir; -+ - #ifdef G_OS_WIN32 - /* If TRUE, do not automatically define "prefix" while - * parsing each .pc file */ -- cgit v1.2.3