glib2/glib2.patch@ea0bfdfbb4ad (annotated)
glib2/glib2.patch
Fri, 22 Oct 2010 13:29:57 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 22 Oct 2010 13:29:57 +0200
- changeset 273
- ea0bfdfbb4ad
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
| michael@273 | 1 | Index: configure |
| michael@273 | 2 | --- configure.orig 2010-03-16 03:52:21.000000000 +0100 |
| michael@273 | 3 | +++ configure 2010-03-17 20:07:17.000000000 +0100 |
| michael@273 | 4 | @@ -25810,7 +25810,7 @@ |
| michael@273 | 5 | add_thread_lib="-l$thread_lib" |
| michael@273 | 6 | IN=" in -l$thread_lib" |
| michael@273 | 7 | fi |
| michael@273 | 8 | - LIBS="$add_thread_lib $glib_save_LIBS" |
| michael@273 | 9 | + LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`" |
| michael@273 | 10 | |
| michael@273 | 11 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_min$IN" >&5 |
| michael@273 | 12 | $as_echo_n "checking for sched_get_priority_min$IN... " >&6; } |
| michael@273 | 13 | Index: glib-2.0.pc.in |
| michael@273 | 14 | --- glib-2.0.pc.in.orig 2009-04-01 01:04:20.000000000 +0200 |
| michael@273 | 15 | +++ glib-2.0.pc.in 2010-03-17 20:07:17.000000000 +0100 |
| michael@273 | 16 | @@ -9,6 +9,7 @@ |
| michael@273 | 17 | |
| michael@273 | 18 | Name: GLib |
| michael@273 | 19 | Description: C Utility Library |
| michael@273 | 20 | +Requires: libpcre |
| michael@273 | 21 | Version: @VERSION@ |
| michael@273 | 22 | Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ |
| michael@273 | 23 | Libs.private: @ICONV_LIBS@ |
| michael@273 | 24 | Index: gmodule/gmodule-dl.c |
| michael@273 | 25 | --- gmodule/gmodule-dl.c.orig 2009-04-01 01:04:20.000000000 +0200 |
| michael@273 | 26 | +++ gmodule/gmodule-dl.c 2010-03-17 20:07:17.000000000 +0100 |
| michael@273 | 27 | @@ -107,6 +107,7 @@ |
| michael@273 | 28 | static gpointer |
| michael@273 | 29 | _g_module_self (void) |
| michael@273 | 30 | { |
| michael@273 | 31 | +#ifndef __FreeBSD__ |
| michael@273 | 32 | gpointer handle; |
| michael@273 | 33 | |
| michael@273 | 34 | /* to query symbols from the program itself, special link options |
| michael@273 | 35 | @@ -118,6 +119,9 @@ |
| michael@273 | 36 | g_module_set_error (fetch_dlerror (TRUE)); |
| michael@273 | 37 | |
| michael@273 | 38 | return handle; |
| michael@273 | 39 | +#else |
| michael@273 | 40 | + return RTLD_DEFAULT; |
| michael@273 | 41 | +#endif |
| michael@273 | 42 | } |
| michael@273 | 43 | |
| michael@273 | 44 | static void |
| michael@273 | 45 | Index: tests/errorcheck-mutex-test.c |
| michael@273 | 46 | --- tests/errorcheck-mutex-test.c.orig 2009-04-01 01:04:20.000000000 +0200 |
| michael@273 | 47 | +++ tests/errorcheck-mutex-test.c 2010-03-17 20:07:17.000000000 +0100 |
| michael@273 | 48 | @@ -1,3 +1,5 @@ |
| michael@273 | 49 | +#ifdef G_THREADS_ENABLED |
| michael@273 | 50 | + |
| michael@273 | 51 | #undef G_DISABLE_ASSERT |
| michael@273 | 52 | #undef G_LOG_DOMAIN |
| michael@273 | 53 | #define G_ERRORCHECK_MUTEXES |
| michael@273 | 54 | @@ -102,9 +104,12 @@ |
| michael@273 | 55 | timed_wait_on_otherwise_locked_mutex} |
| michael@273 | 56 | }; |
| michael@273 | 57 | |
| michael@273 | 58 | +#endif |
| michael@273 | 59 | + |
| michael@273 | 60 | int |
| michael@273 | 61 | main (int argc, char* argv[]) |
| michael@273 | 62 | { |
| michael@273 | 63 | +#ifdef G_THREADS_ENABLED |
| michael@273 | 64 | int i; |
| michael@273 | 65 | |
| michael@273 | 66 | if (argc == 2) |
| michael@273 | 67 | @@ -126,6 +131,7 @@ |
| michael@273 | 68 | { |
| michael@273 | 69 | fprintf (stderr, " %s\n", func_table[i].name); |
| michael@273 | 70 | } |
| michael@273 | 71 | +#endif |
| michael@273 | 72 | |
| michael@273 | 73 | return 0; |
| michael@273 | 74 | } |
