diff -r f96f4c1a2d1a -r ea0bfdfbb4ad glib2/glib2.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glib2/glib2.patch Fri Oct 22 13:29:57 2010 +0200 @@ -0,0 +1,74 @@ +Index: configure +--- configure.orig 2010-03-16 03:52:21.000000000 +0100 ++++ configure 2010-03-17 20:07:17.000000000 +0100 +@@ -25810,7 +25810,7 @@ + add_thread_lib="-l$thread_lib" + IN=" in -l$thread_lib" + fi +- LIBS="$add_thread_lib $glib_save_LIBS" ++ LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5 + $as_echo_n "checking for sched_get_priority_min$IN... " >&6; } +Index: glib-2.0.pc.in +--- glib-2.0.pc.in.orig 2009-04-01 01:04:20.000000000 +0200 ++++ glib-2.0.pc.in 2010-03-17 20:07:17.000000000 +0100 +@@ -9,6 +9,7 @@ + + Name: GLib + Description: C Utility Library ++Requires: libpcre + Version: @VERSION@ + Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ + Libs.private: @ICONV_LIBS@ +Index: gmodule/gmodule-dl.c +--- gmodule/gmodule-dl.c.orig 2009-04-01 01:04:20.000000000 +0200 ++++ gmodule/gmodule-dl.c 2010-03-17 20:07:17.000000000 +0100 +@@ -107,6 +107,7 @@ + static gpointer + _g_module_self (void) + { ++#ifndef __FreeBSD__ + gpointer handle; + + /* to query symbols from the program itself, special link options +@@ -118,6 +119,9 @@ + g_module_set_error (fetch_dlerror (TRUE)); + + return handle; ++#else ++ return RTLD_DEFAULT; ++#endif + } + + static void +Index: tests/errorcheck-mutex-test.c +--- tests/errorcheck-mutex-test.c.orig 2009-04-01 01:04:20.000000000 +0200 ++++ tests/errorcheck-mutex-test.c 2010-03-17 20:07:17.000000000 +0100 +@@ -1,3 +1,5 @@ ++#ifdef G_THREADS_ENABLED ++ + #undef G_DISABLE_ASSERT + #undef G_LOG_DOMAIN + #define G_ERRORCHECK_MUTEXES +@@ -102,9 +104,12 @@ + timed_wait_on_otherwise_locked_mutex} + }; + ++#endif ++ + int + main (int argc, char* argv[]) + { ++#ifdef G_THREADS_ENABLED + int i; + + if (argc == 2) +@@ -126,6 +131,7 @@ + { + fprintf (stderr, " %s\n", func_table[i].name); + } ++#endif + + return 0; + }