From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 18 Nov 2009 02:41:48 +0000 (-0600)
Subject: Bug 600141 - Add -pthread to gmodule pkg-config
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5d97ea298672880ee80964c07b9cf31d604c3df9;p=dana%2Fcg-glib.git

Bug 600141 - Add -pthread to gmodule pkg-config

It is not generally permissible to dlopen() libpthread into a program
that is not already linked with threading support.  The most common case
of this happening is when GIO opens Gvfs (which includes DBus, which
links against libpthread).

Since gmodule is the way that most users cause this problem for
themselves and since the easiest workaround is to link the program with
-pthread, the best fix for the issue is to add -pthread to the gmodule
pkg-config.
---

diff --git a/gmodule-2.0-uninstalled.pc.in b/gmodule-2.0-uninstalled.pc.in
index 9a0d8aac..68f30916 100644
--- a/gmodule-2.0-uninstalled.pc.in
+++ b/gmodule-2.0-uninstalled.pc.in
@@ -4,5 +4,5 @@ Name: GModule Uninstalled
 Description: Dynamic module loader for GLib, Not Installed
 Requires: glib-2.0-uninstalled
 Version: @VERSION@
-Libs: @G_MODULE_LDFLAGS@ ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule
+Libs: @G_MODULE_LDFLAGS@ ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la @G_THREAD_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule @G_THREAD_CFLAGS@
diff --git a/gmodule-2.0.pc.in b/gmodule-2.0.pc.in
index 7117b31e..c9cd04c5 100644
--- a/gmodule-2.0.pc.in
+++ b/gmodule-2.0.pc.in
@@ -9,6 +9,6 @@ Name: GModule
 Description: Dynamic module loader for GLib
 Requires: glib-2.0
 Version: @VERSION@
-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 
+Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
 Libs.private: @G_MODULE_LIBS@
-Cflags:
+Cflags: @G_THREAD_CFLAGS@
diff --git a/gmodule-export-2.0.pc.in b/gmodule-export-2.0.pc.in
index 4bf55973..c9cd04c5 100644
--- a/gmodule-export-2.0.pc.in
+++ b/gmodule-export-2.0.pc.in
@@ -9,6 +9,6 @@ Name: GModule
 Description: Dynamic module loader for GLib
 Requires: glib-2.0
 Version: @VERSION@
-Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0
+Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_THREAD_LIBS@
 Libs.private: @G_MODULE_LIBS@
-Cflags:
+Cflags: @G_THREAD_CFLAGS@
diff --git a/gmodule-no-export-2.0-uninstalled.pc.in b/gmodule-no-export-2.0-uninstalled.pc.in
index bd49e9dc..115820db 100644
--- a/gmodule-no-export-2.0-uninstalled.pc.in
+++ b/gmodule-no-export-2.0-uninstalled.pc.in
@@ -9,6 +9,6 @@ Name: GModule
 Description: Dynamic module loader for GLib
 Requires: glib-2.0
 Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule
+Libs: ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la @G_THREAD_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule @G_THREAD_CFLAGS@
 
diff --git a/gmodule-no-export-2.0.pc.in b/gmodule-no-export-2.0.pc.in
index 6c4c2318..3edd98b6 100644
--- a/gmodule-no-export-2.0.pc.in
+++ b/gmodule-no-export-2.0.pc.in
@@ -9,6 +9,6 @@ Name: GModule
 Description: Dynamic module loader for GLib
 Requires: glib-2.0
 Version: @VERSION@
-Libs: -L${libdir} -lgmodule-2.0
+Libs: -L${libdir} -lgmodule-2.0 @G_THREAD_LIBS@
 Libs.private: @G_MODULE_LIBS@
-Cflags:
+Cflags: @G_THREAD_CFLAGS@