Re: svn commit: r339326 - head

2018-10-13 Thread Bryan Drewery
On 10/12/2018 4:33 AM, Kyle Evans wrote:
> On Fri, Oct 12, 2018 at 12:43 AM Dag-Erling Smørgrav  wrote:
>>
>> Author: des
>> Date: Fri Oct 12 05:42:38 2018
>> New Revision: 339326
>> URL: https://svnweb.freebsd.org/changeset/base/339326
>>
>> Log:
>>   Move libssl up in the bootstrap order.
>>
>>   Submitted by: jkim
>>   Approved by:  re (gjb)
>>
>> Modified:
>>   head/Makefile.inc1
>>
>> Modified: head/Makefile.inc1
>> ==
>> --- head/Makefile.inc1  Fri Oct 12 05:27:58 2018(r339325)
>> +++ head/Makefile.inc1  Fri Oct 12 05:42:38 2018(r339326)
>> @@ -2534,8 +2534,8 @@ _prebuild_libs=   ${_kerberos5_lib_libasn1} \
>> ${_cddl_lib_libctf} \
>> lib/libufs \
>> lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz 
>> lib/msun \
>> -   ${_secure_lib_libcrypto} ${_lib_libldns} \
>> -   ${_secure_lib_libssh} ${_secure_lib_libssl}
>> +   ${_secure_lib_libcrypto} ${_secure_lib_libssl} \
>> +   ${_lib_libldns} ${_secure_lib_libssh}
>>
>>  .if ${MK_GNUCXX} != "no"
>>  _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
>> ___
> 
> Hmm... doesn't this kind of situation also require an __L rule down
> below to prevent the race, since they're both in prebuild_libs?
> 
> Thanks,
> 

Yes, this list is not an ordering. It's just a list. The ordering comes
from __L targets which define the dependency graph.


-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r339326 - head

2018-10-12 Thread Kyle Evans
On Fri, Oct 12, 2018 at 12:43 AM Dag-Erling Smørgrav  wrote:
>
> Author: des
> Date: Fri Oct 12 05:42:38 2018
> New Revision: 339326
> URL: https://svnweb.freebsd.org/changeset/base/339326
>
> Log:
>   Move libssl up in the bootstrap order.
>
>   Submitted by: jkim
>   Approved by:  re (gjb)
>
> Modified:
>   head/Makefile.inc1
>
> Modified: head/Makefile.inc1
> ==
> --- head/Makefile.inc1  Fri Oct 12 05:27:58 2018(r339325)
> +++ head/Makefile.inc1  Fri Oct 12 05:42:38 2018(r339326)
> @@ -2534,8 +2534,8 @@ _prebuild_libs=   ${_kerberos5_lib_libasn1} \
> ${_cddl_lib_libctf} \
> lib/libufs \
> lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun 
> \
> -   ${_secure_lib_libcrypto} ${_lib_libldns} \
> -   ${_secure_lib_libssh} ${_secure_lib_libssl}
> +   ${_secure_lib_libcrypto} ${_secure_lib_libssl} \
> +   ${_lib_libldns} ${_secure_lib_libssh}
>
>  .if ${MK_GNUCXX} != "no"
>  _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
> ___

Hmm... doesn't this kind of situation also require an __L rule down
below to prevent the race, since they're both in prebuild_libs?

Thanks,

Kyle Evans
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r339326 - head

2018-10-11 Thread Dag-Erling Smørgrav
Author: des
Date: Fri Oct 12 05:42:38 2018
New Revision: 339326
URL: https://svnweb.freebsd.org/changeset/base/339326

Log:
  Move libssl up in the bootstrap order.
  
  Submitted by: jkim
  Approved by:  re (gjb)

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Fri Oct 12 05:27:58 2018(r339325)
+++ head/Makefile.inc1  Fri Oct 12 05:42:38 2018(r339326)
@@ -2534,8 +2534,8 @@ _prebuild_libs=   ${_kerberos5_lib_libasn1} \
${_cddl_lib_libctf} \
lib/libufs \
lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
-   ${_secure_lib_libcrypto} ${_lib_libldns} \
-   ${_secure_lib_libssh} ${_secure_lib_libssl}
+   ${_secure_lib_libcrypto} ${_secure_lib_libssl} \
+   ${_lib_libldns} ${_secure_lib_libssh}
 
 .if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"