From nobody Wed Dec 13 20:06:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sr61k1ZQFz54FV0; Wed, 13 Dec 2023 20:06:18 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sr61k0DZWz4Yfj; Wed, 13 Dec 2023 20:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702497978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hKNschQcx98sQVb2Orpq1nLnZrtOWo7jRhGWc+Dnf9o=; b=MK35yyVpe79Bc3WRGcGE7bkSbyWwX+Vduf8tFQVys0bJ4g5PeoICkgVRX8IxpyWTLlSMAp nToi1TykWUXanuX+F8RADRmV2/ayxcMuioFv906qfLoAA0gNNrut5+w8aQ1JAnuj6ckYF3 KNeLohq/wg1eYmpRMaT9chF49pRdJWD1jYXk4gETE+14szmjjs64vukfO6kId0dcHaOVTg QaYk12nlH7AEVl03y9KanywMbZxzeYkp/RPuhRRPgY7yY9KxNI8e9VfBGRFxPqgvt+LBnh RD2ux3uvzyOYOJDXW5Ee0C1UdiXBEuXJRWXYA2GOcWUTLN0xSYOKyDlQ0rZ3/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702497978; a=rsa-sha256; cv=none; b=F7PQdnwH61f6AKcngq3UisM7Q8jJT3IbCYl+k3GluR5j4CMNmtkBWuXWUKSY2hzMsQAH23 jMVvg7wTJke5MHUdp+iAONo9WZdMIEcO0I8L2uMmJoQArSdhF+jv6P6cH0he140tm7FvqB qEBXc7cfyumiZJn0nuJZPsF1Wi3k2brgQnYW+10i39AOoof3t+Mlht9r5sdJIujLF4jqfs csWzIDNGlESEXhIjwIRg5vo5u/hoaDDvDBrSECaFJoBXIIQivgY4ONYMvOy2JiWxWT5OJS XvTzMoJILdpw6lqV+CyAS+DGE6axMS90aAVNQa028GCrHSfYqSKlFeemH2sjKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702497978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hKNschQcx98sQVb2Orpq1nLnZrtOWo7jRhGWc+Dnf9o=; b=L4VQ+7MmDWPnFfd5svSusHDb3kv0kr5Btxt6SjV4D0vAzI9IDCogKMO+WTMVUjEBhvSOq8 OEli1Xx6oi8ttCZLfkkI0zswQgZZM8AHN4/4CrG80wYaTaj1GNlsqhoFeRZGyVwC/yJZX1 X877PsZm4FKAZ57MM1nvkpdM67t1zmHdT/k2FjhDMalwXGyPQJVKK6BButTuowLqG0fG1t hscjHanewl++veHG/yLDzxqC0jIntvNPMwMxHO1Eu0G4oX28dy0YpUcihF1Jr8xB3BJEcC mJgoI5iVSJ5RbIpACScUDTi3t0PEbOsYtKGz5Kreeh9b8oO65pvT5vqQjrsYFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sr61j634nz1Blj; Wed, 13 Dec 2023 20:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BDK6Hpm086869; Wed, 13 Dec 2023 20:06:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDK6HQO086866; Wed, 13 Dec 2023 20:06:17 GMT (envelope-from git) Date: Wed, 13 Dec 2023 20:06:17 GMT Message-Id: <202312132006.3BDK6HQO086866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fd5db125e7fc - stable/13 - Fix prebuild race between libpam and libtacplus. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd5db125e7fc3d687e713b8993146eb148c5be2b Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fd5db125e7fc3d687e713b8993146eb148c5be2b commit fd5db125e7fc3d687e713b8993146eb148c5be2b Author: Dag-Erling Smørgrav AuthorDate: 2023-06-21 20:58:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-12-13 16:08:13 +0000 Fix prebuild race between libpam and libtacplus. Fixes: 21850106fdda MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, emaste Differential Revision: https://reviews.freebsd.org/D40702 (cherry picked from commit bd9049eeff458fc7ee256a891ba285519c6ce550) --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 423c5924d39c..42707c3ccfbc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3050,7 +3050,8 @@ _generic_libs+= ${_DIR} .endif .endfor -lib/libopie__L lib/libtacplus__L: lib/libmd__L +lib/libopie__L: lib/libmd__L +lib/libtacplus__L: lib/libmd__L lib/libpam/libpam__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem