CVS commit: pkgsrc/graphics/MesaLib18

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Oct 10 11:03:02 UTC 2018

Modified Files:
        pkgsrc/graphics/MesaLib18: buildlink3.mk distinfo
        pkgsrc/graphics/MesaLib18/patches: patch-configure.ac

Log Message:
MesaLib18: adjust pthread stubs patch to ensure no OS picks it up, as we
don't provide libpthread stubs.

Note that the name is misleading, libpthread stubs refers to a library
that only pulls in libpthread if a set of functions is not available as
stubs as libc. It is only a pkgconfig file that answers the question
"pull in libpthread? Y/N".

Replace non-existent libpthread stubs buildlink3.mk with the pthread
buildlink3.mk, we should be linking with libpthread for most (all?)
OSes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/MesaLib18/buildlink3.mk \
    pkgsrc/graphics/MesaLib18/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/MesaLib18/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib18/buildlink3.mk
diff -u pkgsrc/graphics/MesaLib18/buildlink3.mk:1.1 pkgsrc/graphics/MesaLib18/buildlink3.mk:1.2
--- pkgsrc/graphics/MesaLib18/buildlink3.mk:1.1 Sun Oct  7 23:49:31 2018
+++ pkgsrc/graphics/MesaLib18/buildlink3.mk     Wed Oct 10 11:03:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/10/10 11:03:02 maya Exp $
 
 BUILDLINK_TREE+=       MesaLib
 
@@ -42,9 +42,7 @@ MESALIB_SUPPORTS_EGL= yes
 MESALIB_SUPPORTS_EGL=  no
 .endif
 
-.if ${X11_TYPE} == "modular"
-.include "../../devel/libpthread-stubs/buildlink3.mk"
-.endif
+.include "../../mk/pthread.buildlink3.mk"
 
 .include "../../x11/libXext/buildlink3.mk"
 .endif # MESALIB_BUILDLINK3_MK
Index: pkgsrc/graphics/MesaLib18/distinfo
diff -u pkgsrc/graphics/MesaLib18/distinfo:1.1 pkgsrc/graphics/MesaLib18/distinfo:1.2
--- pkgsrc/graphics/MesaLib18/distinfo:1.1      Sun Oct  7 23:49:31 2018
+++ pkgsrc/graphics/MesaLib18/distinfo  Wed Oct 10 11:03:02 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2018/10/10 11:03:02 maya Exp $
 
 SHA1 (mesa-18.2.0.tar.xz) = 73723d9f3815487f474d84eb91a5cd17edfb63d4
 RMD160 (mesa-18.2.0.tar.xz) = 51aae6c7a566d7d7da5e545ef3b4f04295897b21
 SHA512 (mesa-18.2.0.tar.xz) = e6e997e166845009f6b97da204384758c797c870b56332652c0a2636734638f9180b7e4dbad144495645308ae4d77981a2493a22d57973723338b658e0655557
 Size (mesa-18.2.0.tar.xz) = 11331164 bytes
 SHA1 (patch-configure) = c938bc7807a92fb4484d459b401133fb9fd7dbce
-SHA1 (patch-configure.ac) = 91dbbca01f324e987560a36986fc3d6c07be82c8
+SHA1 (patch-configure.ac) = 8347a3116906b8648a7841a6b109832397bd896e
 SHA1 (patch-include_GL_internal_dri__interface.h) = 146d2f3f3e50fc1947e8941301d9cf9d90a035e2
 SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
 SHA1 (patch-src_compiler_builtin__type__macros.h) = 857bca0c0f55ec8d7a20b3807c7a5d7bd06bdfbf

Index: pkgsrc/graphics/MesaLib18/patches/patch-configure.ac
diff -u pkgsrc/graphics/MesaLib18/patches/patch-configure.ac:1.1 pkgsrc/graphics/MesaLib18/patches/patch-configure.ac:1.2
--- pkgsrc/graphics/MesaLib18/patches/patch-configure.ac:1.1    Sun Oct  7 23:49:31 2018
+++ pkgsrc/graphics/MesaLib18/patches/patch-configure.ac        Wed Oct 10 11:03:02 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2018/10/10 11:03:02 maya Exp $
 
-Don't check for pthread stubs on netbsd.
+Don't check for pthread stubs anywhere, as we don't provide it.
 
 From FreeBSD ports graphics/mesa-dri 18.0.0,
 DragonFly dports graphics/mesa-dri 17.3.1,
@@ -46,7 +46,7 @@ without DRI3 support.
  dnl project. Even then there's a notable issue as described in the project README
  case "$host_os" in
 -linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu* | openbsd*)
-+linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu* | openbsd* | netbsd*)
++*)
      pthread_stubs_possible="no"
      ;;
  * )