pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/libxml2 FreeBSD 6 and earlier misses the pthr...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/189237796b65
branches:  trunk
changeset: 603048:189237796b65
user:      mishka <mishka%pkgsrc.org@localhost>
date:      Fri Apr 27 15:05:02 2012 +0000

description:
FreeBSD 6 and earlier misses the pthread_equal() stub as well.
While here, improve comments a little bit.

diffstat:

 textproc/libxml2/distinfo                |   4 ++--
 textproc/libxml2/patches/patch-threads.c |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 194b0f4f1e96 -r 189237796b65 textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Fri Apr 27 14:37:37 2012 +0000
+++ b/textproc/libxml2/distinfo Fri Apr 27 15:05:02 2012 +0000
@@ -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-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 -r 194b0f4f1e96 -r 189237796b65 textproc/libxml2/patches/patch-threads.c
--- a/textproc/libxml2/patches/patch-threads.c  Fri Apr 27 14:37:37 2012 +0000
+++ b/textproc/libxml2/patches/patch-threads.c  Fri Apr 27 15:05:02 2012 +0000
@@ -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 @@
  #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 */
  
  /*



Home | Main Index | Thread Index | Old Index