From nobody Fri Dec 16 15:05:06 2022 X-Original-To: dev-commits-src-all@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 4NYXTG54FLz1CW6V; Fri, 16 Dec 2022 15:05:06 +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 4NYXTG41P5z3CYj; Fri, 16 Dec 2022 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671203106; 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=x4naWYLNKsqEzG1VEwFfoXQp+fuMoQHYXlmCRr5Lfn0=; b=L/JyMRXT/cPB7A833LZOhGx6kB46sqyFnq62Z251w5GF58+La6qL4lS4B8/tSrrQWi5dka U4Y/sNTOrCxotX82qjHE3x/yJNXTEVbG9R0UkG0T9A7fxMXHEhYBWzEA4vYyRQbAdlJobp NRdzWtMQyEzdakxGZkXewPFBHFXJNf/C4oWxllut0LlAMy/S8uPAqlh6vZ9PjUc7qBZqcg 1fkcQzmjUZPchZRyBLdAy4Q24bI+Q6tsIduZnTRpyV3uMPnxZtg9tS4bjjAP4poZurF9Ni iwv3mzZtAdeAdgr5fBE0DqwMSfGyoSW839iLPtjyDpozi6ilzm04De+BBXhVFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671203106; 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=x4naWYLNKsqEzG1VEwFfoXQp+fuMoQHYXlmCRr5Lfn0=; b=Qv09/WIgUMCe6WpoCgg+eUQ3WTx3UnKT/zY1Mjr+YeFGwhvtIksvj7GxMFNJm2C49lA88W 8SyOGr+7BKIOvjjuohIS7Z0FBzNxpJyjYP+1wF5ut/aoVo4cFAyT+9LKDSp6dAXeokoqzw 5J6S2/7+VFkMu2juiXWsaWFdL8F8xIcwlQWUeXYwtg57+QfibG05t4rCSJrvaHCLdvTe6C L1a/G4UcIpB8IN6aeMMAjWjNBs1BOc1zBX4vISuj1Ps3tCuj1FXpNl22s/u4mWyUSxpAPY LfXqWcXfXhPaInEgfIlm0m2YFFgwDAhVV3DdNtaOhgOCKhgqyc5OpxFgVaPySw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671203106; a=rsa-sha256; cv=none; b=CFxk5nK/X+BGDr6gqmV/NZwdzx5LogVIc1Euz0+GWeqKXh/PwF6qSyG/ZfJz3AJbUDA6Sv eww9eUeEvu8v4eDrdP2BNeKY9q6+GE30x7eF3WUvs4/Ls6pXHe0pQGlKw3gYKWLtVP5kgO 5Nni653zZpVGmIWTCx6OCL5gzfaeSjiFwlVSzuAIsupLDVx2YqSDRGtO0Z5dRZUo3yq6CS MHu84051ngGSoeEDCZn+Lf6v2sb7dnYe+G04CqqQ3NmDU0IUhzcJtLNtYCFaZLN0dfZtHb jPVXF6UPOJA3nAHdoAA+tm2PNDSPIPmqtkbOITeE+nE7q6L89DOLSapSUlpGfg== 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 4NYXTG2t1nzHNv; Fri, 16 Dec 2022 15:05:06 +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 2BGF56j1055768; Fri, 16 Dec 2022 15:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BGF56Od055767; Fri, 16 Dec 2022 15:05:06 GMT (envelope-from git) Date: Fri, 16 Dec 2022 15:05:06 GMT Message-Id: <202212161505.2BGF56Od055767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e9a573d29c5b - stable/13 - pkgbase: do not record dependency on non-existent liby package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e9a573d29c5bd17174f87c5a3282c711c0806868 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a573d29c5bd17174f87c5a3282c711c0806868 commit e9a573d29c5bd17174f87c5a3282c711c0806868 Author: Ed Maste AuthorDate: 2022-11-17 19:22:33 +0000 Commit: Ed Maste CommitDate: 2022-12-16 15:04:51 +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 (cherry picked from commit 1e9c9ab5957795acc0d436ce21ad07373081d990) --- 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}" ;;