Thu Jun 11 13:11:32 2009 UTC ()
patch-cc: libtoolize src/mesa/drivers/x11/Makefile.
Should fix build with PKG_OPTION dri disabled. (PR pkg/41572)


(tnn)
diff -r1.64 -r1.65 pkgsrc/graphics/MesaLib/distinfo
diff -r0 -r1.1 pkgsrc/graphics/MesaLib/patches/patch-cc
cvs diff -r1.64 -r1.65 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2009/06/10 17:28:07 1.64
+++ pkgsrc/graphics/MesaLib/distinfo 2009/06/11 13:11:32 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.64 2009/06/10 17:28:07 wiz Exp $ 1$NetBSD: distinfo,v 1.65 2009/06/11 13:11:32 tnn Exp $
2 2
3SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa 3SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa
4RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5 4RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5
5Size (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = 1367293 bytes 5Size (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = 1367293 bytes
6SHA1 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 85f357345d71dfe60b785f0cbb03d1e070841c2d 6SHA1 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 85f357345d71dfe60b785f0cbb03d1e070841c2d
7RMD160 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = caa69b7f2aa7136377cda2f690699415396c64ab 7RMD160 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = caa69b7f2aa7136377cda2f690699415396c64ab
8Size (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 328646 bytes 8Size (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 328646 bytes
9SHA1 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = fe70945ccf2c08d18ae4e83000018f0400352065 9SHA1 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = fe70945ccf2c08d18ae4e83000018f0400352065
10RMD160 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = e70b8fd203325e676d90485632bf266e39d46a7e 10RMD160 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = e70b8fd203325e676d90485632bf266e39d46a7e
11Size (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = 3371577 bytes 11Size (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = 3371577 bytes
12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861 12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861
13SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e 13SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e
14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
@@ -22,13 +22,14 @@ SHA1 (patch-aj) = 3749b279b500b1a93e4598 @@ -22,13 +22,14 @@ SHA1 (patch-aj) = 3749b279b500b1a93e4598
22SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 22SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
23SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 23SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
24SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905 24SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
25SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907 25SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
26SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7 26SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
27SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32 27SHA1 (patch-aw) = d2c81d420aafad8ba5a2dcbe59fb331016535e32
28SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3 28SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3
29SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a 29SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
30SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f 30SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
31SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac 31SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac
32SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a 32SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a
33SHA1 (patch-bd) = 61cb50ef49e64ecc0f87750d60244f1ff7b44bd4 33SHA1 (patch-bd) = 61cb50ef49e64ecc0f87750d60244f1ff7b44bd4
34SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477 34SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477
 35SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394
File Added: pkgsrc/graphics/MesaLib/patches/Attic/patch-cc
$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 *~