From a0059f7a59a99cfbfda160af2e2336836163e286 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 13 Jul 2010 14:53:13 +0200 Subject: [PATCH] pkgconfig: Updated (0.23 -> 0.25) --- base/pkgconfig/glib-configure.patch.cross | 101 ++++++------ base/pkgconfig/pkg-config-0.23-sysroot.patch | 40 ----- base/pkgconfig/pkg-config-0.25-sysroot.patch | 153 +++++++++++++++++++ base/pkgconfig/pkgconfig.desc | 6 +- 4 files changed, 201 insertions(+), 99 deletions(-) delete mode 100644 base/pkgconfig/pkg-config-0.23-sysroot.patch create mode 100644 base/pkgconfig/pkg-config-0.25-sysroot.patch diff --git a/base/pkgconfig/glib-configure.patch.cross b/base/pkgconfig/glib-configure.patch.cross index 2e6896f52..4c768d660 100644 --- a/base/pkgconfig/glib-configure.patch.cross +++ b/base/pkgconfig/glib-configure.patch.cross @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../pkgconfig/glib-configure.patch.cross -# Copyright (C) 2008 The OpenSDE Project +# Copyright (C) 2008 - 2010 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -17,71 +17,60 @@ Sadly not all the tests that don't run while cross compiling can be answered using config.cache ---- ./glib-1.2.10/configure.orig 2008-02-21 18:53:14.000000000 +0000 -+++ ./glib-1.2.10/configure 2008-02-21 20:59:07.000000000 +0000 -@@ -20566,11 +20566,8 @@ +--- ./glib-1.2.10/configure.orig 2010-07-12 14:34:25.124557422 +0200 ++++ ./glib-1.2.10/configure 2010-07-12 16:08:12.096505328 +0200 +@@ -12191,10 +12191,8 @@ glib_save_LIBS=$LIBS LIBS="$LIBS -lm" - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { echo "$as_me:$LINENO: result: assuming none" >&5 -+echo "${ECHO_T}assuming none" >&6; } + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming none" >&5 ++$as_echo "none needed" >&6; } else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -28730,11 +28727,11 @@ - echo $ECHO_N "checking whether pthread_mutex_trylock is posix like... $ECHO_C" >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14728,10 +14726,8 @@ + $as_echo_n "checking whether pthread_mutex_trylock is posix like... " >&6; } # DCE Threads return 1 as success, posix 0. what a mess. - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ echo "$as_me:$LINENO: result: assuming yes" >&5 -+echo "${ECHO_T}assuming yes" >&6; } -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX 1 -+_ACEOF + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming yes" >&5 ++$as_echo "assuming yes" >&6; } else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -28790,11 +28787,11 @@ - echo $ECHO_N "checking whether pthread_cond_timedwait is posix like... $ECHO_C" >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14757,10 +14753,8 @@ + $as_echo_n "checking whether pthread_cond_timedwait is posix like... " >&6; } # DCE Threads return -1 as failure, posix ETIMEDOUT. - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ echo "$as_me:$LINENO: result: assuming yes" >&5 -+echo "${ECHO_T}assuming yes" >&6; } -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_PTHREAD_COND_TIMEDWAIT_POSIX 1 -+_ACEOF + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming yes" >&5 ++$as_echo "assuming yes" >&6; } else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29063,11 +29060,12 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -14942,10 +14936,11 @@ done echo "return 0; }" >>confrun.c - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+rm -f $glib_sysdefso + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } +for glib_sysdef_input in POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 ; do + echo "#define GLIB_SYSDEF_${glib_sysdef_input/:/=}" >> $glib_sysdefso +done -+ { echo "$as_me:$LINENO: result: assuming defaults" >&5 -+echo "${ECHO_T}assuming defaults" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming defaults" >&5 ++$as_echo "assuming defaults" >&6; } else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ diff --git a/base/pkgconfig/pkg-config-0.23-sysroot.patch b/base/pkgconfig/pkg-config-0.23-sysroot.patch deleted file mode 100644 index d22307979..000000000 --- a/base/pkgconfig/pkg-config-0.23-sysroot.patch +++ /dev/null @@ -1,40 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../pkgconfig/pkg-config-0.23-sysroot.patch -# Copyright (C) 2009 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -https://bugs.freedesktop.org/attachment.cgi?id=21210 - ---- a/pkg.c 2008-01-16 13:59:49.000000000 -0800 -+++ b/pkg.c 2008-12-16 10:23:15.000000000 -0800 -@@ -472,9 +472,8 @@ - while (tmp != NULL) - { - char *tmpstr = (char*) tmp->data; -- if (pcsysrootdir != NULL) -- { -- if (tmpstr[0] == '-' && -+ if (pcsysrootdir != NULL && -+ tmpstr[0] == '-' && - (tmpstr[1] == 'I' || - tmpstr[1] == 'L')) - { -@@ -483,7 +482,6 @@ - g_string_append (str, pcsysrootdir); - g_string_append (str, tmpstr+2); - } -- } - else - { - g_string_append (str, tmpstr); diff --git a/base/pkgconfig/pkg-config-0.25-sysroot.patch b/base/pkgconfig/pkg-config-0.25-sysroot.patch new file mode 100644 index 000000000..6380d4d3a --- /dev/null +++ b/base/pkgconfig/pkg-config-0.25-sysroot.patch @@ -0,0 +1,153 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../pkgconfig/pkg-config-0.25-sysroot.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: + pkg-config is not taking care if PKG_CONFIG_SYSROOT_DIR environment variable + was set, always prefering its defaults + +Bug-URL: http://bugs.freedesktop.org/show_bug.cgi?id=28264 + +This patch was directly taken from the freedesktop bug-tracker: + +see comment: http://bugs.freedesktop.org/show_bug.cgi?id=28264#c2 + +http://bugs.freedesktop.org/attachment.cgi?id=36074 + +diff -ru a/pkg.c b/pkg.c +--- a/pkg.c 2010-05-08 21:14:17.000000000 +0100 ++++ b/pkg.c 2010-06-05 12:32:08.006581822 +0100 +@@ -751,13 +751,9 @@ + { + GSList *requires = NULL; + GSList *conflicts = NULL; +- GSList *system_directories = NULL; + GSList *iter; + GSList *requires_iter; + GSList *conflicts_iter; +- GSList *system_dir_iter = NULL; +- int count; +- const gchar *c_include_path; + + /* Be sure we have the required fields */ + +@@ -865,107 +861,6 @@ + } + + g_slist_free (requires); +- +- /* We make a list of system directories that gcc expects so we can remove +- * them. +- */ +-#ifndef G_OS_WIN32 +- system_directories = g_slist_append (NULL, g_strdup ("/usr/include")); +-#endif +- +- c_include_path = g_getenv ("C_INCLUDE_PATH"); +- if (c_include_path != NULL) +- { +- system_directories = add_env_variable_to_list (system_directories, c_include_path); +- } +- +- c_include_path = g_getenv ("CPLUS_INCLUDE_PATH"); +- if (c_include_path != NULL) +- { +- system_directories = add_env_variable_to_list (system_directories, c_include_path); +- } +- +- count = 0; +- iter = pkg->I_cflags; +- while (iter != NULL) +- { +- gint offset = 0; +- /* we put things in canonical -I/usr/include (vs. -I /usr/include) format, +- * but if someone changes it later we may as well be robust +- */ +- if (((strncmp (iter->data, "-I", 2) == 0) && (offset = 2))|| +- ((strncmp (iter->data, "-I ", 3) == 0) && (offset = 3))) +- { +- if (offset == 0) +- { +- iter = iter->next; +- continue; +- } +- +- system_dir_iter = system_directories; +- while (system_dir_iter != NULL) +- { +- if (strcmp (system_dir_iter->data, +- ((char*)iter->data) + offset) == 0) +- { +- debug_spew ("Package %s has %s in Cflags\n", +- pkg->name, (gchar *)iter->data); +- if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") == NULL) +- { +- debug_spew ("Removing %s from cflags for %s\n", iter->data, pkg->key); +- ++count; +- iter->data = NULL; +- +- break; +- } +- } +- system_dir_iter = system_dir_iter->next; +- } +- } +- +- iter = iter->next; +- } +- +- while (count) +- { +- pkg->I_cflags = g_slist_remove (pkg->I_cflags, NULL); +- --count; +- } +- +- g_slist_foreach (system_directories, (GFunc) g_free, NULL); +- g_slist_free (system_directories); +- +-#ifdef PREFER_LIB64 +-#define SYSTEM_LIBDIR "/usr/lib64" +-#else +-#define SYSTEM_LIBDIR "/usr/lib" +-#endif +- count = 0; +- iter = pkg->L_libs; +- while (iter != NULL) +- { +- if (strcmp (iter->data, "-L" SYSTEM_LIBDIR) == 0 || +- strcmp (iter->data, "-L " SYSTEM_LIBDIR) == 0) +- { +- debug_spew ("Package %s has -L" SYSTEM_LIBDIR " in Libs\n", +- pkg->name); +- if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL) +- { +- iter->data = NULL; +- ++count; +- debug_spew ("Removing -L" SYSTEM_LIBDIR " from libs for %s\n", pkg->key); +- } +- } +- +- iter = iter->next; +- } +-#undef SYSTEM_LIBDIR +- +- while (count) +- { +- pkg->L_libs = g_slist_remove (pkg->L_libs, NULL); +- --count; +- } + } + + static char* diff --git a/base/pkgconfig/pkgconfig.desc b/base/pkgconfig/pkgconfig.desc index 0e624a1bc..d425f58b9 100644 --- a/base/pkgconfig/pkgconfig.desc +++ b/base/pkgconfig/pkgconfig.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../pkgconfig/pkgconfig.desc -[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -31,8 +31,8 @@ [L] GPL [S] Stable -[V] 0.23 +[V] 0.25 [P] X ?1---5---9 105.000 -[D] 3704338130 pkg-config-0.23.tar.gz http://www.freedesktop.org/software/pkgconfig/releases/ +[D] 626058017 pkg-config-0.25.tar.gz http://www.freedesktop.org/software/pkgconfig/releases/