Tue Feb 3 08:35:13 2009 UTC ()
Reset BUILTIN_PKG after inclution of pthread.builtin.mk.
workaround of PR 40254.


(obache)
diff -r1.15 -r1.16 pkgsrc/graphics/MesaLib/builtin.mk
cvs diff -r1.15 -r1.16 pkgsrc/graphics/MesaLib/builtin.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/builtin.mk 2008/10/05 21:36:35 1.15
+++ pkgsrc/graphics/MesaLib/builtin.mk 2009/02/03 08:35:13 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.15 2008/10/05 21:36:35 cube Exp $ 1# $NetBSD: builtin.mk,v 1.16 2009/02/03 08:35:13 obache Exp $
2 2
3BUILTIN_PKG:= MesaLib 3BUILTIN_PKG:= MesaLib
4 4
5BUILTIN_FIND_FILES_VAR:= H_MESALIB 5BUILTIN_FIND_FILES_VAR:= H_MESALIB
6BUILTIN_FIND_FILES.H_MESALIB= ${X11BASE}/include/GL/glx.h 6BUILTIN_FIND_FILES.H_MESALIB= ${X11BASE}/include/GL/glx.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if !defined(IS_BUILTIN.MesaLib) 14.if !defined(IS_BUILTIN.MesaLib)
@@ -62,20 +62,21 @@ MAKEVARS+= USE_BUILTIN.MesaLib @@ -62,20 +62,21 @@ MAKEVARS+= USE_BUILTIN.MesaLib
62 62
63### 63###
64### The section below only applies if we are not including this file 64### The section below only applies if we are not including this file
65### solely to determine whether a built-in implementation exists. 65### solely to determine whether a built-in implementation exists.
66### 66###
67CHECK_BUILTIN.MesaLib?= no 67CHECK_BUILTIN.MesaLib?= no
68.if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO]) 68.if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO])
69 69
70. if !empty(USE_BUILTIN.MesaLib:M[nN][oO]) 70. if !empty(USE_BUILTIN.MesaLib:M[nN][oO])
71BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 71BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
72. include "../../mk/pthread.buildlink3.mk" 72. include "../../mk/pthread.buildlink3.mk"
73. include "../../mk/pthread.builtin.mk" 73. include "../../mk/pthread.builtin.mk"
74BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 74BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
 75BUILTIN_PKG:= MesaLib
75. endif 76. endif
76 77
77BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 78BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
78. include "../../mk/x11.builtin.mk" 79. include "../../mk/x11.builtin.mk"
79BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 80BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
80 81
81.endif # CHECK_BUILTIN.MesaLib 82.endif # CHECK_BUILTIN.MesaLib