From b78a0792a46cad24fb67abed406f5d6c8add26c1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 30 Jun 2005 19:43:48 +0000 Subject: [PATCH] Apply a patch which may make GLib work on BeOS again. (#309157, Kian 2005-06-30 Matthias Clasen Apply a patch which may make GLib work on BeOS again. (#309157, Kian Duffy) * glib/gmain.c: Update the BeOS includes. * glib/gstdio.c: * glib/gutils.c (g_find_program_in_path): * glib/gbacktrace.c (g_on_error_stack_trace): Use the UNIX implementation on BeOS, as well. * configure.in: Don't put glib 1.0 into G_MODULE_LIBS, even on BeOS. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-12 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ configure.in | 4 ++-- glib/gbacktrace.c | 2 +- glib/gmain.c | 3 ++- glib/gstdio.c | 2 +- glib/gutils.c | 2 +- 9 files changed, 59 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2503b53..0f37f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2005-06-30 Matthias Clasen + Apply a patch which may make GLib work on BeOS again. + (#309157, Kian Duffy) + + * glib/gmain.c: Update the BeOS includes. + + * glib/gstdio.c: + * glib/gutils.c (g_find_program_in_path): + * glib/gbacktrace.c (g_on_error_stack_trace): Use the UNIX + implementation on BeOS, as well. + + * configure.in: Don't put glib 1.0 into G_MODULE_LIBS, even + on BeOS. + * NEWS: Updates 2005-06-26 Tor Lillqvist diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2503b53..0f37f47 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,18 @@ 2005-06-30 Matthias Clasen + Apply a patch which may make GLib work on BeOS again. + (#309157, Kian Duffy) + + * glib/gmain.c: Update the BeOS includes. + + * glib/gstdio.c: + * glib/gutils.c (g_find_program_in_path): + * glib/gbacktrace.c (g_on_error_stack_trace): Use the UNIX + implementation on BeOS, as well. + + * configure.in: Don't put glib 1.0 into G_MODULE_LIBS, even + on BeOS. + * NEWS: Updates 2005-06-26 Tor Lillqvist diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2503b53..0f37f47 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,18 @@ 2005-06-30 Matthias Clasen + Apply a patch which may make GLib work on BeOS again. + (#309157, Kian Duffy) + + * glib/gmain.c: Update the BeOS includes. + + * glib/gstdio.c: + * glib/gutils.c (g_find_program_in_path): + * glib/gbacktrace.c (g_on_error_stack_trace): Use the UNIX + implementation on BeOS, as well. + + * configure.in: Don't put glib 1.0 into G_MODULE_LIBS, even + on BeOS. + * NEWS: Updates 2005-06-26 Tor Lillqvist diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2503b53..0f37f47 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,18 @@ 2005-06-30 Matthias Clasen + Apply a patch which may make GLib work on BeOS again. + (#309157, Kian Duffy) + + * glib/gmain.c: Update the BeOS includes. + + * glib/gstdio.c: + * glib/gutils.c (g_find_program_in_path): + * glib/gbacktrace.c (g_on_error_stack_trace): Use the UNIX + implementation on BeOS, as well. + + * configure.in: Don't put glib 1.0 into G_MODULE_LIBS, even + on BeOS. + * NEWS: Updates 2005-06-26 Tor Lillqvist diff --git a/configure.in b/configure.in index f75db75..5e999e1 100644 --- a/configure.in +++ b/configure.in @@ -1106,7 +1106,7 @@ fi dnl *** load_image (BeOS) if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then AC_CHECK_LIB(root, load_image, - [G_MODULE_LIBS="-lbe -lroot -lglib" + [G_MODULE_LIBS="-lbe -lroot -lglib-2.0 " G_MODULE_LIBS_EXTRA="-L\$(top_builddir_full)/.libs" G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule" G_MODULE_IMPL=G_MODULE_IMPL_BEOS], @@ -1705,7 +1705,7 @@ fi case $host in *-*-beos*) - G_THREAD_LIBS="-lbe -lroot -lglib " + G_THREAD_LIBS="-lbe -lroot -lglib-2.0 " G_THREAD_LIBS_EXTRA="-L\$(top_builddir_full)/.libs" ;; *) diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c index ac30b00..934c8ca 100644 --- a/glib/gbacktrace.c +++ b/glib/gbacktrace.c @@ -157,7 +157,7 @@ g_on_error_query (const gchar *prg_name) void g_on_error_stack_trace (const gchar *prg_name) { -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_BEOS) pid_t pid; gchar buf[16]; gchar *args[4] = { "gdb", NULL, NULL, NULL }; diff --git a/glib/gmain.c b/glib/gmain.c index 4d262e2..582d2f6 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -68,7 +68,8 @@ #endif /* G_OS_WIN32 */ #ifdef G_OS_BEOS -#include +#include +#include #endif /* G_OS_BEOS */ #ifdef G_OS_UNIX diff --git a/glib/gstdio.c b/glib/gstdio.c index 35fa87e..6809b29 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -43,7 +43,7 @@ #include "galias.h" -#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) +#if !defined (G_OS_UNIX) && !defined (G_OS_WIN32) && !defined (G_OS_BEOS) #error Please port this to your operating system #endif diff --git a/glib/gutils.c b/glib/gutils.c index 0d3d286..ffa8968 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -374,7 +374,7 @@ g_find_program_in_path (const gchar *program) } path = g_getenv ("PATH"); -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_BEOS) if (path == NULL) { /* There is no `PATH' in the environment. The default -- 2.7.4