glib2.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. Index: configure
  2. --- configure.orig 2006-12-18 21:28:37 +0100
  3. +++ configure 2006-12-19 08:11:07 +0100
  4. @@ -34435,7 +34435,7 @@
  5. add_thread_lib="-l$thread_lib"
  6. IN=" in -l$thread_lib"
  7. fi
  8. - LIBS="$add_thread_lib $glib_save_LIBS"
  9. + LIBS="$add_thread_lib `echo x$glib_save_LIBS | sed -e 's;^x;;' -e 's;-lrt;;'`"
  10. { echo "$as_me:$LINENO: checking for sched_get_priority_min$IN" >&5
  11. echo $ECHO_N "checking for sched_get_priority_min$IN... $ECHO_C" >&6; }
  12. Index: gmodule/gmodule-dl.c
  13. --- gmodule/gmodule-dl.c.orig 2004-02-20 02:41:00 +0100
  14. +++ gmodule/gmodule-dl.c 2006-12-19 08:11:07 +0100
  15. @@ -106,6 +106,7 @@
  16. static gpointer
  17. _g_module_self (void)
  18. {
  19. +#ifndef __FreeBSD__
  20. gpointer handle;
  21. /* to query symbols from the program itself, special link options
  22. @@ -117,6 +118,9 @@
  23. g_module_set_error (fetch_dlerror (TRUE));
  24. return handle;
  25. +#else
  26. + return RTLD_DEFAULT;
  27. +#endif
  28. }
  29. static void
  30. Index: tests/errorcheck-mutex-test.c
  31. --- tests/errorcheck-mutex-test.c.orig 2006-05-11 01:58:26 +0200
  32. +++ tests/errorcheck-mutex-test.c 2006-12-19 08:11:07 +0100
  33. @@ -1,3 +1,5 @@
  34. +#ifdef G_THREADS_ENABLED
  35. +
  36. #undef G_DISABLE_ASSERT
  37. #undef G_LOG_DOMAIN
  38. #define G_ERRORCHECK_MUTEXES
  39. @@ -102,9 +104,12 @@
  40. timed_wait_on_otherwise_locked_mutex}
  41. };
  42. +#endif
  43. +
  44. int
  45. main (int argc, char* argv[])
  46. {
  47. +#ifdef G_THREADS_ENABLED
  48. int i;
  49. if (argc == 2)
  50. @@ -126,6 +131,7 @@
  51. {
  52. fprintf (stderr, " %s\n", func_table[i].name);
  53. }
  54. +#endif
  55. return 0;
  56. }