[pkgsrc/trunk]: pkgsrc/graphics/MesaLib patch-cc: libtoolize src/mesa/drivers...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/48d2ef6427c7
branches:  trunk
changeset: 560379:48d2ef6427c7
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jun 11 13:11:32 2009 +0000

description:
patch-cc: libtoolize src/mesa/drivers/x11/Makefile.
Should fix build with PKG_OPTION dri disabled. (PR pkg/41572)

diffstat:

 graphics/MesaLib/distinfo         |   3 ++-
 graphics/MesaLib/patches/patch-cc |  38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)

diffs (56 lines):

diff -r b641ef5cec98 -r 48d2ef6427c7 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Thu Jun 11 12:37:43 2009 +0000
+++ b/graphics/MesaLib/distinfo Thu Jun 11 13:11:32 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2009/06/10 17:28:07 wiz Exp $
+$NetBSD: distinfo,v 1.65 2009/06/11 13:11:32 tnn Exp $
 
 SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa
 RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5
@@ -32,3 +32,4 @@
 SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a
 SHA1 (patch-bd) = 61cb50ef49e64ecc0f87750d60244f1ff7b44bd4
 SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477
+SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394
diff -r b641ef5cec98 -r 48d2ef6427c7 graphics/MesaLib/patches/patch-cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/patches/patch-cc Thu Jun 11 13:11:32 2009 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-cc,v 1.1 2009/06/11 13:11:32 tnn Exp $
+
+--- src/mesa/drivers/x11/Makefile.orig 2008-08-25 16:46:44.000000000 +0200
++++ src/mesa/drivers/x11/Makefile
+@@ -43,25 +43,24 @@ INCLUDE_DIRS = \
+       -I$(TOP)/src/mesa \
+       -I$(TOP)/src/mesa/main
+ 
+-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
++CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la
+ 
+ 
+ 
+ .c.o:
+-      $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
++      $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDE_DIRS) \
++              $(CFLAGS) $< -o $(@:.o=.lo)
+ 
+ 
+ default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+ 
+ 
+ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA)
+-      @ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+-              -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+-              -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+-              -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).$(GL_MAJOR).dylib \
+-              $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
+-
+-
++      $(LIBTOOL) --mode=link $(CC) \
++              -o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) $(LDFLAGS) \
++              -rpath $(PREFIX)/lib \
++              -version-info $(GL_MAJOR):$(GL_MINOR):0 \
++              $(GL_LIB_DEPS) $(OBJECTS:.o=.lo) $(CORE_MESA)
+ 
+ clean:
+       -rm -f *.o *~