Thu Jul 7 07:37:17 2011 UTC ()
Distribute libmpfr and libmpc across the dependency barriers so that
additional .WAITs are not needed.


(matt)
diff -r1.171 -r1.172 src/lib/Makefile
cvs diff -r1.171 -r1.172 src/lib/Makefile (expand / switch to unified diff)

--- src/lib/Makefile 2011/07/07 07:33:40 1.171
+++ src/lib/Makefile 2011/07/07 07:37:17 1.172
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.171 2011/07/07 07:33:40 mrg Exp $ 1# $NetBSD: Makefile,v 1.172 2011/07/07 07:37:17 matt Exp $
2# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 2# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6SUBDIR= csu 6SUBDIR= csu
7 7
8.if (${MKGCC} != "no") 8.if (${MKGCC} != "no")
9. if ${HAVE_GCC} == 4 9. if ${HAVE_GCC} == 4
10. if (${USE_COMPILERCRTSTUFF} == "yes") 10. if (${USE_COMPILERCRTSTUFF} == "yes")
11SUBDIR+= ../gnu/lib/crtstuff4 11SUBDIR+= ../gnu/lib/crtstuff4
12. endif 12. endif
13SUBDIR+= ../gnu/lib/libgcc4 13SUBDIR+= ../gnu/lib/libgcc4
14. else 14. else
@@ -68,30 +68,28 @@ SUBDIR+= ../external/mit/lua/lib @@ -68,30 +68,28 @@ SUBDIR+= ../external/mit/lua/lib
68 68
69SUBDIR+= ../external/public-domain/xz/lib 69SUBDIR+= ../external/public-domain/xz/lib
70 70
71SUBDIR+= ../gnu/lib/libmalloc 71SUBDIR+= ../gnu/lib/libmalloc
72 72
73.if (${MKGCC} != "no") 73.if (${MKGCC} != "no")
74. if ${HAVE_GCC} == 4 74. if ${HAVE_GCC} == 4
75SUBDIR+= ../gnu/lib/libobjc4 75SUBDIR+= ../gnu/lib/libobjc4
76. else 76. else
77SUBDIR+= ../external/gpl3/gcc/lib/libobjc 77SUBDIR+= ../external/gpl3/gcc/lib/libobjc
78. endif 78. endif
79.endif 79.endif
80 80
81. if ${HAVE_GCC} >= 45 81.if ${HAVE_GCC} >= 45
82SUBDIR+= ../external/lgpl3/gmp/lib/libgmp .WAIT 82SUBDIR+= ../external/lgpl3/gmp/lib/libgmp
83SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr .WAIT 
84SUBDIR+= ../external/lgpl2/mpc/lib/libmpc 
85.endif 83.endif
86 84
87# 85#
88# Libraries that depend upon any listed previously 86# Libraries that depend upon any listed previously
89# (and those that depend upon these [and ...]) 87# (and those that depend upon these [and ...])
90# 88#
91#==================== 1st library dependency barrier ==================== 89#==================== 1st library dependency barrier ====================
92SUBDIR+= .WAIT 90SUBDIR+= .WAIT
93 91
94SUBDIR+= libcurses # depends on libterminfo 92SUBDIR+= libcurses # depends on libterminfo
95SUBDIR+= libdm # depends on libprop 93SUBDIR+= libdm # depends on libprop
96SUBDIR+= libedit # depends on libterminfo 94SUBDIR+= libedit # depends on libterminfo
97SUBDIR+= libquota # depends on libprop and librpcsvc 95SUBDIR+= libquota # depends on libprop and librpcsvc
@@ -123,26 +121,30 @@ SUBDIR+= ../external/gpl2/lvm2/lib # dep @@ -123,26 +121,30 @@ SUBDIR+= ../external/gpl2/lvm2/lib # dep
123SUBDIR+= ../external/gpl3/binutils/lib # libbfd depends on libz 121SUBDIR+= ../external/gpl3/binutils/lib # libbfd depends on libz
124.endif 122.endif
125 123
126.if (${MKGCC} != "no" && ${MKCXX} != "no") 124.if (${MKGCC} != "no" && ${MKCXX} != "no")
127. if ${HAVE_GCC} == 4 125. if ${HAVE_GCC} == 4
128SUBDIR+= ../gnu/lib/libstdc++-v3_4 # depends on libm 126SUBDIR+= ../gnu/lib/libstdc++-v3_4 # depends on libm
129SUBDIR+= ../gnu/lib/libsupc++4 127SUBDIR+= ../gnu/lib/libsupc++4
130. else 128. else
131SUBDIR+= ../external/gpl3/gcc/lib/libstdc++-v3 129SUBDIR+= ../external/gpl3/gcc/lib/libstdc++-v3
132SUBDIR+= ../external/gpl3/gcc/lib/libsupc++ 130SUBDIR+= ../external/gpl3/gcc/lib/libsupc++
133. endif 131. endif
134.endif 132.endif
135 133
 134.if ${HAVE_GCC} >= 45
 135SUBDIR+= ../external/lgpl3/mpfr/lib/libmpfr
 136.endif
 137
136#==================== 2nd library dependency barrier ==================== 138#==================== 2nd library dependency barrier ====================
137SUBDIR+= .WAIT 139SUBDIR+= .WAIT
138 140
139SUBDIR+= libform # depends on libcurses 141SUBDIR+= libform # depends on libcurses
140 142
141.if (${MKKERBEROS} != "no") 143.if (${MKKERBEROS} != "no")
142SUBDIR+= ../crypto/external/bsd/heimdal/lib # depends on libcrypto 144SUBDIR+= ../crypto/external/bsd/heimdal/lib # depends on libcrypto
143 # libedit, libterminfo, 145 # libedit, libterminfo,
144.endif 146.endif
145 147
146SUBDIR+= libmenu # depends on libcurses 148SUBDIR+= libmenu # depends on libcurses
147SUBDIR+= libradius # depends on libcrypto if (${MKCRYPTO} != "no") 149SUBDIR+= libradius # depends on libcrypto if (${MKCRYPTO} != "no")
148SUBDIR+= librump # depends on librumpuser 150SUBDIR+= librump # depends on librumpuser
@@ -151,26 +153,30 @@ SUBDIR+= librump # depends on librumpus @@ -151,26 +153,30 @@ SUBDIR+= librump # depends on librumpus
151SUBDIR+= ../crypto/external/bsd/openssh/lib # depends on libcrypto, libz 153SUBDIR+= ../crypto/external/bsd/openssh/lib # depends on libcrypto, libz
152SUBDIR+= ../crypto/external/bsd/netpgp/lib # depends on libcrypto, ... 154SUBDIR+= ../crypto/external/bsd/netpgp/lib # depends on libcrypto, ...
153.endif 155.endif
154 156
155SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto 157SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
156SUBDIR+= ../external/bsd/fetch/lib # depends on libssl 158SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
157 159
158.if (${MKLDAP} != "no") 160.if (${MKLDAP} != "no")
159SUBDIR+= ../external/bsd/openldap/lib # depends on libcrypto, ... 161SUBDIR+= ../external/bsd/openldap/lib # depends on libcrypto, ...
160.endif 162.endif
161 163
162SUBDIR+= librumphijack 164SUBDIR+= librumphijack
163 165
 166.if ${HAVE_GCC} >= 45
 167SUBDIR+= ../external/lgpl2/mpc/lib/libmpc
 168.endif
 169
164#==================== 3rd library dependency barrier ==================== 170#==================== 3rd library dependency barrier ====================
165SUBDIR+= .WAIT 171SUBDIR+= .WAIT
166 172
167SUBDIR+= librumpdev # depends on librump 173SUBDIR+= librumpdev # depends on librump
168SUBDIR+= librumpnet # depends on librump 174SUBDIR+= librumpnet # depends on librump
169SUBDIR+= librumpvfs # depends on librump 175SUBDIR+= librumpvfs # depends on librump
170 176
171#==================== 4th library dependency barrier ==================== 177#==================== 4th library dependency barrier ====================
172SUBDIR+= .WAIT 178SUBDIR+= .WAIT
173 179
174SUBDIR+= libukfs # depends on librumpvfs, librump 180SUBDIR+= libukfs # depends on librumpvfs, librump
175 181
176#==================== 5th library dependency barrier ==================== 182#==================== 5th library dependency barrier ====================