[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Remove second -o argument in libOSMes...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3d5b41d1ef9
branches:  trunk
changeset: 542089:d3d5b41d1ef9
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Thu May 01 15:37:13 2008 +0000

description:
Remove second -o argument in libOSMesa link command (which was obviously
my mistake).  Set MAKE_JOBS_SAFE=no when building libOSMesa because
it breaks the build.  Non-dri builds should work now.

diffstat:

 graphics/MesaLib/distinfo         |  4 ++--
 graphics/MesaLib/options.mk       |  6 +++++-
 graphics/MesaLib/patches/patch-ad |  5 ++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r da733c7cc8b4 -r d3d5b41d1ef9 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Thu May 01 15:15:09 2008 +0000
+++ b/graphics/MesaLib/distinfo Thu May 01 15:37:13 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2008/04/30 07:00:14 bjs Exp $
+$NetBSD: distinfo,v 1.52 2008/05/01 15:37:13 bjs Exp $
 
 SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd
 RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a
@@ -18,7 +18,7 @@
 SHA1 (patch-aa) = 6db543357cfe41fe1ab1fc16d823ff61d3e8646b
 SHA1 (patch-ab) = ab6c3eb50f2e8091aeca30f92f55e02661c099e9
 SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
-SHA1 (patch-ad) = ab71ff80c6d0af6bed9e6810bb38fd83e8bdc3be
+SHA1 (patch-ad) = 5667b1bfab7cfeb1b9ea8750798f027fd0ccfd44
 SHA1 (patch-ae) = e1c37a279cf3fc78d7eb43e392abbb40d3419a5f
 SHA1 (patch-af) = da03d949c3105bc548b4c6c762e8a787a995aa94
 SHA1 (patch-ag) = 9010c8c90a43a37bbc5766957e25536ac67e55b5
diff -r da733c7cc8b4 -r d3d5b41d1ef9 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Thu May 01 15:15:09 2008 +0000
+++ b/graphics/MesaLib/options.mk       Thu May 01 15:37:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/04/27 09:43:12 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2008/05/01 15:37:13 bjs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap
@@ -78,6 +78,10 @@
 .else
 BUILD_TARGET=  pkgsrc${BUILD_TARGET_SUFFIX}
 PLIST.nodri=   # empty
+###
+### XXX building libOSMesa breaks with -j, and GNU make has no .WAIT
+###
+MAKE_JOBS_SAFE=                        no
 .endif
 ###
 ### XXX This is the default heap size.  Would there be an occasion to
diff -r da733c7cc8b4 -r d3d5b41d1ef9 graphics/MesaLib/patches/patch-ad
--- a/graphics/MesaLib/patches/patch-ad Thu May 01 15:15:09 2008 +0000
+++ b/graphics/MesaLib/patches/patch-ad Thu May 01 15:37:13 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.12 2008/04/25 15:39:54 tnn Exp $
+$NetBSD: patch-ad,v 1.13 2008/05/01 15:37:13 bjs Exp $
 
 --- src/mesa/Makefile.orig     2007-12-03 20:00:21.000000000 +0100
 +++ src/mesa/Makefile
@@ -82,7 +82,7 @@
  
  ######################################################################
  # Stand-alone Mesa libGL and libOSMesa
-@@ -111,29 +116,30 @@ osmesa-only: depend subdirs $(TOP)/$(LIB
+@@ -111,29 +116,29 @@ osmesa-only: depend subdirs $(TOP)/$(LIB
  
  # Make the GL library
  $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
@@ -119,7 +119,6 @@
 +              $(LIBTOOL) --mode=link $(CC) \
 +                      -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \
 +                      $(LDFLAGS) -version-info 6:5:3 \
-+                      -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \
 +                      -rpath $(PREFIX)/lib $(OSMESA_LIB_DEPS) \
 +                      $(OSMESA_DRIVER_OBJECTS:.o=.lo) ; \
        fi