[pkgsrc/trunk]: pkgsrc/graphics/MesaLib18 Revert previous for OSX, it's still...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fa80803e887
branches:  trunk
changeset: 318107:7fa80803e887
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Jan 19 23:21:43 2019 +0000

description:
Revert previous for OSX, it's still needed. Document the reason why in patch.

diffstat:

 graphics/MesaLib18/Makefile                          |   3 ++-
 graphics/MesaLib18/distinfo                          |   4 ++--
 graphics/MesaLib18/patches/patch-src_glx_Makefile.am |  19 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r 3880c5650f6f -r 7fa80803e887 graphics/MesaLib18/Makefile
--- a/graphics/MesaLib18/Makefile       Sat Jan 19 22:57:46 2019 +0000
+++ b/graphics/MesaLib18/Makefile       Sat Jan 19 23:21:43 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/01/19 22:19:05 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2019/01/19 23:21:43 tnn Exp $
 
 DISTNAME=      mesa-18.3.2
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -87,6 +87,7 @@
 CXXFLAGS.NetBSD+=      -Dalloca=__builtin_alloca
 
 pre-configure:
+       touch ${WRKSRC}/src/glx/apple_dummy.cpp
        cd ${WRKSRC} && autoreconf -vif
 
 DRIRC_DIR=             ${PKG_SYSCONFDIR}/drirc.d
diff -r 3880c5650f6f -r 7fa80803e887 graphics/MesaLib18/distinfo
--- a/graphics/MesaLib18/distinfo       Sat Jan 19 22:57:46 2019 +0000
+++ b/graphics/MesaLib18/distinfo       Sat Jan 19 23:21:43 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2019/01/19 22:19:05 tnn Exp $
+$NetBSD: distinfo,v 1.13 2019/01/19 23:21:43 tnn Exp $
 
 SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7
 RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c
@@ -26,7 +26,7 @@
 SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839
 SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4
 SHA1 (patch-src_gbm_Makefile.am) = 5f3107afbf64b97f7d21ce427cecc4fb78974db3
-SHA1 (patch-src_glx_Makefile.am) = b9b13fdec40eb94401c84184b8cfd4e40e6397b9
+SHA1 (patch-src_glx_Makefile.am) = 869c4f2388f835b9b296b3c84c2a03ef7717f17d
 SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b
 SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
 SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242
diff -r 3880c5650f6f -r 7fa80803e887 graphics/MesaLib18/patches/patch-src_glx_Makefile.am
--- a/graphics/MesaLib18/patches/patch-src_glx_Makefile.am      Sat Jan 19 22:57:46 2019 +0000
+++ b/graphics/MesaLib18/patches/patch-src_glx_Makefile.am      Sat Jan 19 23:21:43 2019 +0000
@@ -1,7 +1,13 @@
-$NetBSD: patch-src_glx_Makefile.am,v 1.2 2019/01/19 22:19:05 tnn Exp $
+$NetBSD: patch-src_glx_Makefile.am,v 1.3 2019/01/19 23:21:43 tnn Exp $
 
 - We don't need libmesautil.la here. Those symbols seem to already be
   included in libmesa.la.
+- force libtool to use clang++ to link libGL on OSX.
+  Otherwise we get:
+  Undefined symbols for architecture x86_64:
+  "std::terminate()", referenced from:
+      ___clang_call_terminate in libglx.a(glsl_parser.o)
+      ...
 
 --- src/glx/Makefile.am.orig   2019-01-17 11:26:23.000000000 +0000
 +++ src/glx/Makefile.am
@@ -30,3 +36,14 @@
  endif
  
  if HAVE_WINDOWSDRI
+@@ -187,6 +194,10 @@ lib@GL_LIB@_la_SOURCES =
+ lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
+ lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
+ 
++if HAVE_APPLEDRI
++lib@GL_LIB@_la_SOURCES += apple_dummy.cpp
++endif
++
+ if HAVE_WINDOWSDRI
+ lib@GL_LIB@_la_LDFLAGS += -lgdi32 -lopengl32 -Wl,--disable-stdcall-fixup
+ endif