summaryrefslogtreecommitdiff
path: root/textproc/libxml2
diff options
context:
space:
mode:
authormishka <mishka>2012-04-27 15:05:02 +0000
committermishka <mishka>2012-04-27 15:05:02 +0000
commit59ca0e3b642064ae08d9862360ea116d27cbaf7e (patch)
treedf18b2aec17804368352de15b97b01b616465f72 /textproc/libxml2
parentb8e6b96b9f9c3add4cee8c5af936816c5cef471f (diff)
downloadpkgsrc-59ca0e3b642064ae08d9862360ea116d27cbaf7e.tar.gz
FreeBSD 6 and earlier misses the pthread_equal() stub as well.
While here, improve comments a little bit.
Diffstat (limited to 'textproc/libxml2')
-rw-r--r--textproc/libxml2/distinfo4
-rw-r--r--textproc/libxml2/patches/patch-threads.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 032e6781739..a9def88f85d 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2012/04/03 09:08:33 obache Exp $
+$NetBSD: distinfo,v 1.91 2012/04/27 15:05:02 mishka Exp $
SHA1 (libxml2-2.7.8.tar.gz) = 859dd535edbb851cc15b64740ee06551a7a17d40
RMD160 (libxml2-2.7.8.tar.gz) = 30709622cfe3e2175e73d6701b7e19a25ab5ac47
@@ -18,5 +18,5 @@ SHA1 (patch-al) = 45f984fef5cf5d04c46e940867707897396a9c9f
SHA1 (patch-am) = ae7ab69b7bba2271d2d996161cc8b9956d0b06fa
SHA1 (patch-include_libxml_xpath.h) = 3fc74551a7843668cf9ffee19b1f20ccb674e153
SHA1 (patch-testapi.c) = 63a0a34c8ca98d9214c4d3391e97d9a9ca4569f8
-SHA1 (patch-threads.c) = f686b5b3af1d09da8edb95b311780ae69071bcb2
+SHA1 (patch-threads.c) = 38bf7d702c21057795eec88d4e239b5df598382d
SHA1 (patch-xpointer.c) = fa720fd515bab3f99bb11bf56320b3ad8e5fb211
diff --git a/textproc/libxml2/patches/patch-threads.c b/textproc/libxml2/patches/patch-threads.c
index 41274d1ca63..26b47dc6fbc 100644
--- a/textproc/libxml2/patches/patch-threads.c
+++ b/textproc/libxml2/patches/patch-threads.c
@@ -1,7 +1,7 @@
-$NetBSD: patch-threads.c,v 1.1 2012/04/03 09:08:33 obache Exp $
+$NetBSD: patch-threads.c,v 1.2 2012/04/27 15:05:02 mishka Exp $
-* Treat OpenBSD and MirBSD sam as Linux to avoid linked with libpthreead.
-* NetBSD<4.99.36 lack of pthread_equal() stub function in libc.
+* Treat OpenBSD and MirBSD same as Linux to avoid linking with libpthread.
+* NetBSD<4.99.36 and FreeBSD<7.0 lack pthread_equal() stub function in libc.
--- threads.c.orig 2010-10-15 17:28:30.000000000 +0000
+++ threads.c
@@ -28,10 +28,10 @@ $NetBSD: patch-threads.c,v 1.1 2012/04/03 09:08:33 obache Exp $
#endif
#endif /* linux */
#endif /* __GNUC__ */
-+#if defined(__NetBSD__) && __NetBSD_Version__ < 499003600
++#if (defined(__NetBSD__) && __NetBSD_Version__ < 499003600) || (defined(__FreeBSD__) && __FreeBSD_version < 700000)
+extern int pthread_equal ()
+ __attribute((weak));
-+#endif /* NetBSD-4 */
++#endif /* NetBSD-4, FreeBSD-6 */
#endif /* HAVE_PTHREAD_H */
/*