summaryrefslogtreecommitdiff
path: root/devel/glib2
diff options
context:
space:
mode:
authorchris <chris@pkgsrc.org>2003-02-09 00:57:13 +0000
committerchris <chris@pkgsrc.org>2003-02-09 00:57:13 +0000
commit5aa046ef456018b98e0de648bed41c71cf8b886c (patch)
tree354f05c107deea9135ab28e2c8865bff13ab6b9e /devel/glib2
parent2a95fc68a5c2ee27f83816706be25e5fdc59d54f (diff)
downloadpkgsrc-5aa046ef456018b98e0de648bed41c71cf8b886c.tar.gz
Fix gtk2 failing to build on -current. The problem is that the
gthread.la file doesn't note that pthread is a dependancy, so linking with libtool against libgthread breaks. It seems the workaround for libtool not understanding -pthread doesn't work, so we use the same thing as linux, and convert -pthread to -lpthread. gtk2 now builds to completion on -current Note that this has no impact on 1.6.1 as it doesn't use -pthread.
Diffstat (limited to 'devel/glib2')
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-ab13
2 files changed, 15 insertions, 1 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 83ef84ccdae..84561175e4c 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.14 2003/01/29 10:32:41 tron Exp $
+$NetBSD: distinfo,v 1.15 2003/02/09 00:57:13 chris Exp $
SHA1 (glib-2.2.0.tar.bz2) = ec3c19d2ebb498e1036cec8fcc8ace57331ce290
Size (glib-2.2.0.tar.bz2) = 1494036 bytes
SHA1 (patch-aa) = 6f1a12477763df0edcffd58819e2319f2bfbef4a
+SHA1 (patch-ab) = cf7fd8b57974a01a718ccacb622f874993034de2
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
new file mode 100644
index 00000000000..b0add5a45d3
--- /dev/null
+++ b/devel/glib2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.6 2003/02/09 00:57:14 chris Exp $
+
+--- configure.orig 2003-02-09 00:44:10.000000000 +0000
++++ configure 2003-02-09 00:46:14.000000000 +0000
+@@ -19025,7 +19025,7 @@
+ # b) libtool doesn't recognize -pthread as a library dependency.
+ #
+ case $host in
+- *-*-linux*)
++ *-*-linux* | *-*-netbsd*)
+ G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
+ ;;
+ *)