From 66a12cdfaed5a1e46c86a941206abee2bdcbdb2d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 16 Dec 2002 22:14:40 +0000 Subject: [PATCH] Add a hack to mostly deal with problems in support of -pthread and Mon Dec 16 14:58:33 2002 Owen Taylor * configure.in: Add a hack to mostly deal with problems in support of -pthread and -lpthread; pass -lpthread (for linux) or -Wc,-pthread (for other platforms) to libtool when linking libgthread. (#100697) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ configure.in | 17 +++++++++++++++++ 8 files changed, 73 insertions(+) diff --git a/ChangeLog b/ChangeLog index 15aaa83..a5c043d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Dec 16 14:58:33 2002 Owen Taylor + + * configure.in: Add a hack to mostly deal with + problems in support of -pthread and -lpthread; + pass -lpthread (for linux) or -Wc,-pthread (for + other platforms) to libtool when linking libgthread. + (#100697) + 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 15aaa83..a5c043d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Dec 16 14:58:33 2002 Owen Taylor + + * configure.in: Add a hack to mostly deal with + problems in support of -pthread and -lpthread; + pass -lpthread (for linux) or -Wc,-pthread (for + other platforms) to libtool when linking libgthread. + (#100697) + 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 15aaa83..a5c043d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Mon Dec 16 14:58:33 2002 Owen Taylor + + * configure.in: Add a hack to mostly deal with + problems in support of -pthread and -lpthread; + pass -lpthread (for linux) or -Wc,-pthread (for + other platforms) to libtool when linking libgthread. + (#100697) + 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 15aaa83..a5c043d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Mon Dec 16 14:58:33 2002 Owen Taylor + + * configure.in: Add a hack to mostly deal with + problems in support of -pthread and -lpthread; + pass -lpthread (for linux) or -Wc,-pthread (for + other platforms) to libtool when linking libgthread. + (#100697) + 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 15aaa83..a5c043d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Mon Dec 16 14:58:33 2002 Owen Taylor + + * configure.in: Add a hack to mostly deal with + problems in support of -pthread and -lpthread; + pass -lpthread (for linux) or -Wc,-pthread (for + other platforms) to libtool when linking libgthread. + (#100697) + 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 15aaa83..a5c043d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Dec 16 14:58:33 2002 Owen Taylor + + * configure.in: Add a hack to mostly deal with + problems in support of -pthread and -lpthread; + pass -lpthread (for linux) or -Wc,-pthread (for + other platforms) to libtool when linking libgthread. + (#100697) + 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 15aaa83..a5c043d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Dec 16 14:58:33 2002 Owen Taylor + + * configure.in: Add a hack to mostly deal with + problems in support of -pthread and -lpthread; + pass -lpthread (for linux) or -Wc,-pthread (for + other platforms) to libtool when linking libgthread. + (#100697) + 2002-12-16 Tor Lillqvist * glib/gspawn-win32.c (do_spawn): Fix potential heap diff --git a/configure.in b/configure.in index 3ae989f..4d2d1bd 100644 --- a/configure.in +++ b/configure.in @@ -1713,10 +1713,27 @@ if test x"$glib_cv_sizeof_system_thread" = x; then GLIB_SIZEOF(,void *, system_thread) fi +# +# Hack to deal with: +# +# a) GCC < 3.3 for Linux doesn't include -lpthread when +# building shared libraries with linux. +# b) libtool doesn't recognize -pthread as a library dependency. +# +case $host in + *-*-linux*) + G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" + ;; + *) + G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-Wc,-pthread/`" + ;; +esac + AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c", [Source file containing theread implementation]) AC_SUBST(G_THREAD_CFLAGS) AC_SUBST(G_THREAD_LIBS) +AC_SUBST(G_THREAD_LIBS_FOR_GTHREAD) AC_SUBST(G_THREAD_LIBS_EXTRA) dnl ********************************************** -- 2.7.4