From nobody Fri Nov 18 18:19:31 2022 X-Original-To: dev-commits-src-main@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 4NDQ6X2PK9z4j4cw; Fri, 18 Nov 2022 18:19:32 +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 4NDQ6X1rwZz4FcF; Fri, 18 Nov 2022 18:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795572; 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=cb0m6ZaTjZjMu7gqBCz9lLxz6D5olAcO/9O2bSdORyI=; b=OnA6YnQ+auNX1CimhwMhqvGHHrY0B7jk16lSf67fEvuagcuCi0U0KdZTJH7NniGs1WO7F3 NrDFHrz9gvmUXjUoa31Z8dm9uV0KVmtjZEu/hjdi8x0ydR1F73dtme8PlDRP6uO0/7kESZ tbLSaZ8EZlUNVB1243ehDens3v3Trm+g0z68arJn+SYH04NP7hPR2/gv3DkR96/OdxW7Qn njux4fdPAZr+Wfp4gpWp4Vxx3FTtZtVHU3dnFLoqreno2sn+bGQ2uzIq2IAK5bzF0BEQDX OE3pNDo3d2HCuXfE3zBnLQVJ/VoXDE6WzB8x0U0Xj18kNXxjI4ZH9atqwbIGMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795572; 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=cb0m6ZaTjZjMu7gqBCz9lLxz6D5olAcO/9O2bSdORyI=; b=Q0gDpHtuvYc2KX5NSXf/eIuEaEWaM2Ofyjk5ZbwOFgevqIhQQIVBDkaXUfvYNuGt+i8UKC sVf+Arw1lDc1MvgiLIhT/zGO4qRZ/gDAcUD9HTCycs3Tw/xxNstcM+ItyqB/L/CTbJGiBs r3E2kkjiy4ALBtwkUBf0a3cVtw1MSG3fAupH/MTG8GpRZDUUrEWEoR7HZITQYkSg26hcC2 AgWn2TGOD1XVxjBpUK5TIm+PROsVbPs63ANodHdcbrTch+7oob1qXGcLxlBst/IWURrTe4 AOV2onWumSiQbZ5MVJwe0Sq30shfJ1my9aqTLI0JFgArxFHIjw3XGt83UOOv5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668795572; a=rsa-sha256; cv=none; b=yT6fJ3gDfoXjcwzdz9aSwYek48tcv+M3z2x7f6/jTEUVOIzLio4h1jPJbvDmLwHhCIHb+3 H3yFuMjsx/XG76JdhFfrmfxWUsYlCSX5ywkfzaar1lVUo68I5juPdrC7O5vUqBGsMbdcdY urSQMKoYx7Wy+uodLZrtqecw8S6lxDGmnRRD4cjMVr4RFWkA5DVhdvC3xTMFmX0GJjDkw5 28SUSgqTC90JIRV69LxduwooeDFFwS3+R8jeTSa423iHadEHwVgUs6CXZSueCForIECiX5 uhsjnjaINAsqc30u6glafdDpoJ2HGLCWfUR5whl/f6RyNLwIwKUzJhhzpUwv8A== 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 4NDQ6X0qPWzGGh; Fri, 18 Nov 2022 18:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AIIJVwG015688; Fri, 18 Nov 2022 18:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIIJVYp015687; Fri, 18 Nov 2022 18:19:31 GMT (envelope-from git) Date: Fri, 18 Nov 2022 18:19:31 GMT Message-Id: <202211181819.2AIIJVYp015687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1e9c9ab59577 - main - pkgbase: do not record dependency on non-existent liby package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e9c9ab5957795acc0d436ce21ad07373081d990 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1e9c9ab5957795acc0d436ce21ad07373081d990 commit 1e9c9ab5957795acc0d436ce21ad07373081d990 Author: Ed Maste AuthorDate: 2022-11-17 19:22:33 +0000 Commit: Ed Maste CommitDate: 2022-11-18 18:08:46 +0000 pkgbase: do not record dependency on non-existent liby package liby-dev provides (only) liby.a. liby has no headers or man pages, and there is no liby package. Add a special case to record no dependency on the package that does not exist. PR: 266923 Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37429 --- release/packages/generate-ucl.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 2988b48b10a9..de1a21391950 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -45,6 +45,18 @@ main() { caroot) pkgdeps="openssl" ;; + + # -dev packages that have no corresponding non-dev package + # as a dependency. + liby-dev) + outname=${outname%%-dev} + _descr="Development Files" + ;; + liby-lib32_dev) + outname=${outname%%-lib32_dev} + _descr="32-bit Libraries, Development Files" + ;; + utilities) uclfile="${uclfile}" ;;