luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply a patch which may make GLib work on BeOS again. (#309157, Kian

Browse Source 
2005-06-30  Matthias Clasen  <mclasen@redhat.com>

	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.
This commit is contained in:
Matthias Clasen 2005-06-30 19:43:48 +00:00 committed by Matthias Clasen
parent c888581c43
commit b78a0792a4
9 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,5 +1,18 @@
2005-06-30 Matthias Clasen <mclasen@redhat.com> 2005-06-30 Matthias Clasen <mclasen@redhat.com>
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 * NEWS: Updates
2005-06-26 Tor Lillqvist <tml@novell.com> 2005-06-26 Tor Lillqvist <tml@novell.com>

13
ChangeLog.pre-2-10
View File

@ -1,5 +1,18 @@
2005-06-30 Matthias Clasen <mclasen@redhat.com> 2005-06-30 Matthias Clasen <mclasen@redhat.com>
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 * NEWS: Updates
2005-06-26 Tor Lillqvist <tml@novell.com> 2005-06-26 Tor Lillqvist <tml@novell.com>

13
ChangeLog.pre-2-12
View File

@ -1,5 +1,18 @@
2005-06-30 Matthias Clasen <mclasen@redhat.com> 2005-06-30 Matthias Clasen <mclasen@redhat.com>
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 * NEWS: Updates
2005-06-26 Tor Lillqvist <tml@novell.com> 2005-06-26 Tor Lillqvist <tml@novell.com>

13
ChangeLog.pre-2-8
View File

@ -1,5 +1,18 @@
2005-06-30 Matthias Clasen <mclasen@redhat.com> 2005-06-30 Matthias Clasen <mclasen@redhat.com>
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 * NEWS: Updates
2005-06-26 Tor Lillqvist <tml@novell.com> 2005-06-26 Tor Lillqvist <tml@novell.com>

4
configure.in
View File

@ -1106,7 +1106,7 @@ fi
dnl *** load_image (BeOS) dnl *** load_image (BeOS)
if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then
AC_CHECK_LIB(root, load_image, 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_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule" G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule"
G_MODULE_IMPL=G_MODULE_IMPL_BEOS], G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
@ -1705,7 +1705,7 @@ fi
case $host in case $host in
*-*-beos*) *-*-beos*)
G_THREAD_LIBS="-lbe -lroot -lglib " G_THREAD_LIBS="-lbe -lroot -lglib-2.0 "
G_THREAD_LIBS_EXTRA="-L\$(top_builddir_full)/.libs" G_THREAD_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
;; ;;
*) *)

2
glib/gbacktrace.c
View File

@ -157,7 +157,7 @@ g_on_error_query (const gchar *prg_name)
void void
g_on_error_stack_trace (const gchar *prg_name) 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; pid_t pid;
gchar buf[16]; gchar buf[16];
gchar *args[4] = { "gdb", NULL, NULL, NULL }; gchar *args[4] = { "gdb", NULL, NULL, NULL };

3
glib/gmain.c
View File

@ -68,7 +68,8 @@
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
#ifdef G_OS_BEOS #ifdef G_OS_BEOS
#include <net/socket.h> #include <sys/socket.h>
#include <sys/wait.h>
#endif /* G_OS_BEOS */ #endif /* G_OS_BEOS */
#ifdef G_OS_UNIX #ifdef G_OS_UNIX

2
glib/gstdio.c
View File

@ -43,7 +43,7 @@
#include "galias.h" #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 #error Please port this to your operating system
#endif #endif

2
glib/gutils.c
View File

@ -374,7 +374,7 @@ g_find_program_in_path (const gchar *program)
} }
path = g_getenv ("PATH"); path = g_getenv ("PATH");
#ifdef G_OS_UNIX #if defined(G_OS_UNIX) || defined(G_OS_BEOS)
if (path == NULL) if (path == NULL)
{ {
/* There is no `PATH' in the environment. The default /* There is no `PATH' in the environment. The default