From owner-svn-src-all@freebsd.org  Fri May  1 18:27:14 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B87AE2DC7C6;
 Fri,  1 May 2020 18:27:14 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49DLM63xfdz3wtV;
 Fri,  1 May 2020 18:27:14 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82ADAC88C;
 Fri,  1 May 2020 18:27:14 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 041IREVU083319;
 Fri, 1 May 2020 18:27:14 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 041IREq8083318;
 Fri, 1 May 2020 18:27:14 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <202005011827.041IREq8083318@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 1 May 2020 18:27:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r360542 - in stable: 10 11 12
X-SVN-Group: stable-12
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: in stable: 10 11 12
X-SVN-Commit-Revision: 360542
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 May 2020 18:27:14 -0000

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/12/Makefile.inc1
Directory Properties:
  stable/12/   (props changed)

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

Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1	Fri May  1 17:50:26 2020	(r360541)
+++ stable/12/Makefile.inc1	Fri May  1 18:27:14 2020	(r360542)
@@ -2626,7 +2626,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
 lib/libkvm__L: lib/libelf__L
 
 .if ${MK_LIBTHR} != "no"