From 6eb60364c44be5113ff39abb1e0cacece9595d81 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Jun 2008 21:00:59 +0000 Subject: pkgconfig: bump version and cleanup Upgrade to pkgconfig 0.23 which has native sysroot support (buggy, but easily fixable), which allows us to get rid of pkgconfig-filter.sh. At the same time cleanup the makefile. --- package/pkgconfig/configure.patch | 331 -------------------------------------- 1 file changed, 331 deletions(-) delete mode 100644 package/pkgconfig/configure.patch (limited to 'package/pkgconfig/configure.patch') diff --git a/package/pkgconfig/configure.patch b/package/pkgconfig/configure.patch deleted file mode 100644 index e672d7e31..000000000 --- a/package/pkgconfig/configure.patch +++ /dev/null @@ -1,331 +0,0 @@ ---- pkgconfig-0.15.0/glib-1.2.8/Makefile.am~configure.patch -+++ pkgconfig-0.15.0/glib-1.2.8/Makefile.am -@@ -65,7 +65,7 @@ - - CONFIGURE_DEPENDENCIES = acglib.m4 - --BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h -+BUILT_SOURCES += stamp-gc-h #note: not glibconfig.h - glibconfig.h: stamp-gc-h - @: - stamp-gc-h: config.status ---- pkgconfig-0.20/configure.in~configure.patch -+++ pkgconfig-0.20/configure.in -@@ -1,6 +1,7 @@ - - AC_INIT(pkg-config.1) - -+AC_CONFIG_AUX_DIR(.) - AM_INIT_AUTOMAKE(pkg-config, 0.21) - AM_MAINTAINER_MODE - -@@ -92,8 +93,6 @@ - - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_CFLAGS) -- -- AC_CONFIG_AUX_DIR(.) - else - AC_CONFIG_SUBDIRS(glib-1.2.8) - fi # !native_win32 ---- pkgconfig-0.20/glib-1.2.8/configure.in.orig 2005-10-16 11:12:52.000000000 -0600 -+++ pkgconfig-0.20/glib-1.2.8/configure.in 2006-07-07 16:11:05.000000000 -0600 -@@ -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) -@@ -15,6 +16,39 @@ - # we rewrite this file - rm -f glibconfig-sysdefs.h - -+# 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([ -@@ -173,7 +207,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 - -@@ -384,11 +420,13 @@ - return realloc (0, sizeof (int)) == 0; - }], - glib_cv_sane_realloc=yes -- AC_DEFINE(REALLOC_0_WORKS) - , - glib_cv_sane_realloc=no - ,) - ]) -+if test "x$glib_cv_sane_realloc" = "xyes"; then -+ AC_DEFINE(REALLOC_0_WORKS) -+fi - AC_MSG_RESULT($glib_cv_sane_realloc) - - -@@ -464,7 +502,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 -@@ -473,6 +512,7 @@ - fi - AC_MSG_RESULT($glib_cv_va_val_copy) - -+AC_MSG_WARN([hi mom]) - - dnl *********************** - dnl *** g_module checks *** -@@ -484,12 +524,12 @@ - G_MODULE_HAVE_DLERROR=0 - dnl *** dlopen() and dlsym() in system libraries - 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 -@@ -578,6 +618,7 @@ - AC_SUBST(G_MODULE_HAVE_DLERROR) - AC_SUBST(G_MODULE_NEED_USCORE) - AC_SUBST(GLIB_DEBUG_FLAGS) -+AC_MSG_WARN([hi mom]) - - - dnl *********************** -@@ -891,13 +932,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 *** -@@ -954,7 +996,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 -@@ -1071,15 +1113,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 <