svn commit: r360542 - in stable: 10 11 12

[Dimitry Andric]

Author: dim
Date: Fri May  1 18:27:14 2020
New Revision: 360542
URL: https://svnweb.freebsd.org/changeset/base/360542

Log:
  MFC r360322:
  
  Fix race between prebuilding libsbuf and libgeom
  
  The latter needs the former, but with a multi-job build on a fast
  machine, the race is sometimes lost. This leads to "ld: error: unable to
  find library -lsbuf", when linking libgeom.so.
  
  Submitted by:	kevans

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/Makefile.inc1
  stable/12/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)
  stable/12/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Fri May  1 17:50:26 2020	(r360541)
+++ stable/10/Makefile.inc1	Fri May  1 18:27:14 2020	(r360542)
@@ -1738,7 +1738,7 @@ gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw
 _prebuild_libs+= lib/libc++
 .endif
 
-lib/libgeom__L: lib/libexpat__L
+lib/libgeom__L: lib/libexpat__L lib/libsbuf__L
 
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
 .if !defined(WITH_ATF)