Thu May 1 15:37:13 2008 UTC ()
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.


(bjs)
diff -r1.51 -r1.52 pkgsrc/graphics/MesaLib/distinfo
diff -r1.3 -r1.4 pkgsrc/graphics/MesaLib/options.mk
diff -r1.12 -r1.13 pkgsrc/graphics/MesaLib/patches/patch-ad
cvs diff -r1.51 -r1.52 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2008/04/30 07:00:14 1.51
+++ pkgsrc/graphics/MesaLib/distinfo 2008/05/01 15:37:13 1.52
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: distinfo,v 1.51 2008/04/30 07:00:14 bjs Exp $ 1$NetBSD: distinfo,v 1.52 2008/05/01 15:37:13 bjs Exp $
2 2
3SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd 3SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd
4RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a 4RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a
5Size (Mesa-7.0.3/Mesa-7.0.3-001) = 12578 bytes 5Size (Mesa-7.0.3/Mesa-7.0.3-001) = 12578 bytes
6SHA1 (Mesa-7.0.3/Mesa-7.0.3-002) = 9fcdeb76d4cf44f0aeadff48bf7c48335773a2c0 6SHA1 (Mesa-7.0.3/Mesa-7.0.3-002) = 9fcdeb76d4cf44f0aeadff48bf7c48335773a2c0
7RMD160 (Mesa-7.0.3/Mesa-7.0.3-002) = 63b568f9c3f0e09cf53de064aee3350b4f96ee2d 7RMD160 (Mesa-7.0.3/Mesa-7.0.3-002) = 63b568f9c3f0e09cf53de064aee3350b4f96ee2d
8Size (Mesa-7.0.3/Mesa-7.0.3-002) = 639 bytes 8Size (Mesa-7.0.3/Mesa-7.0.3-002) = 639 bytes
9SHA1 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = c8dfef08f3b3f7abc70d99e16a35b0bbc1af4f8a 9SHA1 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = c8dfef08f3b3f7abc70d99e16a35b0bbc1af4f8a
10RMD160 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 22917fbab3987e1d60d46321e1a77d5cbdd3800c 10RMD160 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 22917fbab3987e1d60d46321e1a77d5cbdd3800c
11Size (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 1342158 bytes 11Size (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 1342158 bytes
12SHA1 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = ce263120bfa258d6cf791c21d506ea215e806b5f 12SHA1 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = ce263120bfa258d6cf791c21d506ea215e806b5f
13RMD160 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 9cf615868d540d3121b1219b0395f5f268e407cd 13RMD160 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 9cf615868d540d3121b1219b0395f5f268e407cd
14Size (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 329421 bytes 14Size (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 329421 bytes
15SHA1 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 49b92094a25f189b411f393174ee666e73dddf36 15SHA1 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 49b92094a25f189b411f393174ee666e73dddf36
16RMD160 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 1672be9d235f19c779c42ea4f443995b1844c836 16RMD160 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 1672be9d235f19c779c42ea4f443995b1844c836
17Size (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 3389327 bytes 17Size (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 3389327 bytes
18SHA1 (patch-aa) = 6db543357cfe41fe1ab1fc16d823ff61d3e8646b 18SHA1 (patch-aa) = 6db543357cfe41fe1ab1fc16d823ff61d3e8646b
19SHA1 (patch-ab) = ab6c3eb50f2e8091aeca30f92f55e02661c099e9 19SHA1 (patch-ab) = ab6c3eb50f2e8091aeca30f92f55e02661c099e9
20SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 20SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
21SHA1 (patch-ad) = ab71ff80c6d0af6bed9e6810bb38fd83e8bdc3be 21SHA1 (patch-ad) = 5667b1bfab7cfeb1b9ea8750798f027fd0ccfd44
22SHA1 (patch-ae) = e1c37a279cf3fc78d7eb43e392abbb40d3419a5f 22SHA1 (patch-ae) = e1c37a279cf3fc78d7eb43e392abbb40d3419a5f
23SHA1 (patch-af) = da03d949c3105bc548b4c6c762e8a787a995aa94 23SHA1 (patch-af) = da03d949c3105bc548b4c6c762e8a787a995aa94
24SHA1 (patch-ag) = 9010c8c90a43a37bbc5766957e25536ac67e55b5 24SHA1 (patch-ag) = 9010c8c90a43a37bbc5766957e25536ac67e55b5
25SHA1 (patch-ah) = 3e60a700697f200fb2819f9270a37ad4a5cfa695 25SHA1 (patch-ah) = 3e60a700697f200fb2819f9270a37ad4a5cfa695
26SHA1 (patch-ai) = 171a27e6e4a5ed92c6c2355283179e2091031a79 26SHA1 (patch-ai) = 171a27e6e4a5ed92c6c2355283179e2091031a79
27SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c 27SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
28SHA1 (patch-ak) = 74a1ffa426de7720a771c1d94aecb7bde17fd26c 28SHA1 (patch-ak) = 74a1ffa426de7720a771c1d94aecb7bde17fd26c
29SHA1 (patch-al) = b734af278352de120b704025ff2e9ac127e5ec7f 29SHA1 (patch-al) = b734af278352de120b704025ff2e9ac127e5ec7f
30SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 30SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
31SHA1 (patch-an) = a6960dcf6c184fa0692c0f679ebb59e004e0f499 31SHA1 (patch-an) = a6960dcf6c184fa0692c0f679ebb59e004e0f499
32SHA1 (patch-ao) = 3b1f615bcf0ea14814f8e7763ba6fc9411078667 32SHA1 (patch-ao) = 3b1f615bcf0ea14814f8e7763ba6fc9411078667
33SHA1 (patch-ap) = 20237356cd866c2ebe573124bba7be66fb335754 33SHA1 (patch-ap) = 20237356cd866c2ebe573124bba7be66fb335754
34SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 34SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
cvs diff -r1.3 -r1.4 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2008/04/27 09:43:12 1.3
+++ pkgsrc/graphics/MesaLib/options.mk 2008/05/01 15:37:13 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2008/04/27 09:43:12 tnn Exp $ 1# $NetBSD: options.mk,v 1.4 2008/05/01 15:37:13 bjs Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap 4PKG_SUPPORTED_OPTIONS= mesa-execmem-mmap
5 5
6# Assembler code build configurations 6# Assembler code build configurations
7.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 7.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
8 ${OPSYS} != "SunOS" 8 ${OPSYS} != "SunOS"
9PKG_SUPPORTED_OPTIONS+= ${MACHINE_ARCH} 9PKG_SUPPORTED_OPTIONS+= ${MACHINE_ARCH}
10PKG_SUGGESTED_OPTIONS+= ${MACHINE_ARCH} 10PKG_SUGGESTED_OPTIONS+= ${MACHINE_ARCH}
11.endif 11.endif
12### 12###
13### XXX Prior to this patch, Mesa only allocated executable memory 13### XXX Prior to this patch, Mesa only allocated executable memory
14### with mmap(2) and PROT_EXEC on linux. On e.g. OpenBSD and NetBSD, 14### with mmap(2) and PROT_EXEC on linux. On e.g. OpenBSD and NetBSD,
@@ -68,24 +68,28 @@ PKG_SUGGESTED_OPTIONS+= dri @@ -68,24 +68,28 @@ PKG_SUGGESTED_OPTIONS+= dri
68 ${OPSYS} != "SunOS" 68 ${OPSYS} != "SunOS"
69BUILD_TARGET_SUFFIX= -${MACHINE_ARCH} 69BUILD_TARGET_SUFFIX= -${MACHINE_ARCH}
70.else 70.else
71BUILD_TARGET_SUFFIX= # empty 71BUILD_TARGET_SUFFIX= # empty
72.endif 72.endif
73 73
74.if !empty(PKG_OPTIONS:Mdri) 74.if !empty(PKG_OPTIONS:Mdri)
75BUILD_TARGET= pkgsrc-dri${BUILD_TARGET_SUFFIX} 75BUILD_TARGET= pkgsrc-dri${BUILD_TARGET_SUFFIX}
76PLIST.dri= # empty 76PLIST.dri= # empty
77. include "../../graphics/MesaLib/dri.mk" 77. include "../../graphics/MesaLib/dri.mk"
78.else 78.else
79BUILD_TARGET= pkgsrc${BUILD_TARGET_SUFFIX} 79BUILD_TARGET= pkgsrc${BUILD_TARGET_SUFFIX}
80PLIST.nodri= # empty 80PLIST.nodri= # empty
 81###
 82### XXX building libOSMesa breaks with -j, and GNU make has no .WAIT
 83###
 84MAKE_JOBS_SAFE= no
81.endif 85.endif
82### 86###
83### XXX This is the default heap size. Would there be an occasion to 87### XXX This is the default heap size. Would there be an occasion to
84### change it? It seems large, so we should investigate further. 88### change it? It seems large, so we should investigate further.
85### 89###
86MESA_EXECMEM_HEAPSIZE?= 10485760 90MESA_EXECMEM_HEAPSIZE?= 10485760
87 91
88.if !empty(PKG_OPTIONS:Mmesa-execmem-mmap) 92.if !empty(PKG_OPTIONS:Mmesa-execmem-mmap)
89CFLAGS+= -DMESA_EXECMEM_MMAP 93CFLAGS+= -DMESA_EXECMEM_MMAP
90CFLAGS+= -DEXEC_HEAP_SIZE=${MESA_EXECMEM_HEAPSIZE:M[0-9]*:Q} 94CFLAGS+= -DEXEC_HEAP_SIZE=${MESA_EXECMEM_HEAPSIZE:M[0-9]*:Q}
91.endif 95.endif
cvs diff -r1.12 -r1.13 pkgsrc/graphics/MesaLib/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-ad 2008/04/25 15:39:54 1.12
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-ad 2008/05/01 15:37:13 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ad,v 1.12 2008/04/25 15:39:54 tnn Exp $ 1$NetBSD: patch-ad,v 1.13 2008/05/01 15:37:13 bjs Exp $
2 2
3--- src/mesa/Makefile.orig 2007-12-03 20:00:21.000000000 +0100 3--- src/mesa/Makefile.orig 2007-12-03 20:00:21.000000000 +0100
4+++ src/mesa/Makefile 4+++ src/mesa/Makefile
5@@ -8,19 +8,22 @@ include sources 5@@ -8,19 +8,22 @@ include sources
6  6
7 GL_MAJOR = 1 7 GL_MAJOR = 1
8 GL_MINOR = 5 8 GL_MINOR = 5
9-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) 9-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
10+GL_TINY = 0 10+GL_TINY = 0
11  11
12  12
13 .SUFFIXES : .cpp 13 .SUFFIXES : .cpp
14  14
@@ -72,27 +72,27 @@ $NetBSD: patch-ad,v 1.12 2008/04/25 15:3 @@ -72,27 +72,27 @@ $NetBSD: patch-ad,v 1.12 2008/04/25 15:3
72- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ 72- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
73- $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \ 73- $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \
74- $(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS) 74- $(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS)
75- 75-
76+ @ $(LIBTOOL) --mode=link $(CC) \ 76+ @ $(LIBTOOL) --mode=link $(CC) \
77+ -o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) $(LDFLAGS) \ 77+ -o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) $(LDFLAGS) \
78+ -rpath $(PREFIX)/lib $(CORE_OBJECTS:.o=.lo) \ 78+ -rpath $(PREFIX)/lib $(CORE_OBJECTS:.o=.lo) \
79+ -version-info $(MESA_MAJOR):$(MESA_MINOR):$(MESA_TINY) \ 79+ -version-info $(MESA_MAJOR):$(MESA_MINOR):$(MESA_TINY) \
80+ $(FBDEV_DRIVER_OBJECTS:.o=.lo) \ 80+ $(FBDEV_DRIVER_OBJECTS:.o=.lo) \
81+ $(COMMON_DRIVER_OBJECTS:.o=.lo) $(GL_LIB_DEPS) 81+ $(COMMON_DRIVER_OBJECTS:.o=.lo) $(GL_LIB_DEPS)
82  82
83 ###################################################################### 83 ######################################################################
84 # Stand-alone Mesa libGL and libOSMesa 84 # Stand-alone Mesa libGL and libOSMesa
85@@ -111,29 +116,30 @@ osmesa-only: depend subdirs $(TOP)/$(LIB 85@@ -111,29 +116,29 @@ osmesa-only: depend subdirs $(TOP)/$(LIB
86  86
87 # Make the GL library 87 # Make the GL library
88 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) 88 $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
89- @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ 89- @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
90- -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ 90- -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
91- -install $(TOP)/$(LIB_DIR) \ 91- -install $(TOP)/$(LIB_DIR) \
92- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) 92- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
93+ @ $(LIBTOOL) --mode=link $(CC) \ 93+ @ $(LIBTOOL) --mode=link $(CC) \
94+ -o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \ 94+ -o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \
95+ -version-info $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \ 95+ -version-info $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
96+ -rpath $(PREFIX)/lib $(LDFLAGS) $(GL_LIB_DEPS) \ 96+ -rpath $(PREFIX)/lib $(LDFLAGS) $(GL_LIB_DEPS) \
97+ $(STAND_ALONE_OBJECTS:.o=.lo) 97+ $(STAND_ALONE_OBJECTS:.o=.lo)
98+ 98+
@@ -109,27 +109,26 @@ $NetBSD: patch-ad,v 1.12 2008/04/25 15:3 @@ -109,27 +109,26 @@ $NetBSD: patch-ad,v 1.12 2008/04/25 15:3
109+ $(LIBTOOL) --mode=link $(CC) \ 109+ $(LIBTOOL) --mode=link $(CC) \
110+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \ 110+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \
111+ $(LDFLAGS) -version-info 6:5:3 -rpath $(PREFIX)/lib \ 111+ $(LDFLAGS) -version-info 6:5:3 -rpath $(PREFIX)/lib \
112+ $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS:.o=.lo) ; \ 112+ $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS:.o=.lo) ; \
113 else \ 113 else \
114- $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \ 114- $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
115- -ldflags '$(LDFLAGS)' \ 115- -ldflags '$(LDFLAGS)' \
116- -major 6 -minor 5 -patch 3 \ 116- -major 6 -minor 5 -patch 3 \
117- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ 117- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
118- $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ 118- $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
119+ $(LIBTOOL) --mode=link $(CC) \ 119+ $(LIBTOOL) --mode=link $(CC) \
120+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \ 120+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \
121+ $(LDFLAGS) -version-info 6:5:3 \ 121+ $(LDFLAGS) -version-info 6:5:3 \
122+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \ 
123+ -rpath $(PREFIX)/lib $(OSMESA_LIB_DEPS) \ 122+ -rpath $(PREFIX)/lib $(OSMESA_LIB_DEPS) \
124+ $(OSMESA_DRIVER_OBJECTS:.o=.lo) ; \ 123+ $(OSMESA_DRIVER_OBJECTS:.o=.lo) ; \
125 fi 124 fi
126  125
127- 126-
128 ###################################################################### 127 ######################################################################
129 # libGL pkg-config file 128 # libGL pkg-config file
130 pcedit = sed \ 129 pcedit = sed \
131@@ -164,20 +170,26 @@ subdirs: 130@@ -164,20 +170,26 @@ subdirs:
132  131
133  132
134 install: default gl.pc 133 install: default gl.pc
135- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL 134- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL