From nobody Thu Jul 24 17:14:12 2025 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 4bnyKK2gF9z62xtF; Thu, 24 Jul 2025 17:14:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnyKK15Xsz3cbc; Thu, 24 Jul 2025 17:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753377253; 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=eyw8WIMgRn3WS+6/FwboV2sOIr/mJEW8wwQi3L/0ZsU=; b=GgbRf2tRdp0VXyGPnydTZKiL8NGhuaG8Wxo1Gapg8vKl0GLs6Cx/FAjMoWNAdD5si3OUzo 4pihPeGpw8I+Srvj5607dhiFsWT21KdyOb1JAG7Awjue4oSv58bFtFt2G4UicxgkXMQOhZ 9I607MeIvqNOkV6j6ZN+6przjkihccCAu/DCFMsMG9A9/v4z440hewDXnWYPx6UsHeUZBv HJVIyQervhXaD58pMLyrjoI0mi2/JFqNndMWW9rpKTJYvfUo3gVuZMicwy/MDrkMFDb+uZ qXVL+hMopBTokxVjdKMZg5vI+lupwFg1fCV3cjdWoLjfdE/WY2M49bmEcDW8jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753377253; 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=eyw8WIMgRn3WS+6/FwboV2sOIr/mJEW8wwQi3L/0ZsU=; b=N58UECR24FG4QZA2bQ1Y/igAuHPSq4+D23pnlPljIQpY4jqhVTgu/jHN0iRlmqd/WH0I4X lVQKBIguY3/lY0EELZtGnQPOlf/sx9cwdqJ2pnH9iXe0x1k4xgflleKCEYj9uACvTjX31x ZxJNGPow+7GHUc4AwRK3bJvNpP5Zf6kuEX1olY0DFJMBlPQJkFAZZEHoFS3EaCmHbk1eXA e80yP3DRlr4/mmeuYehqc/Y5G8CGNaIPxn/wYxrmEvfyTUnzO58W5neifDbhYdshck8bjn RGoCHQUxImHer8lbIa/FCc+SGYdrm4fgpXa27Z2jNGP3qr+PEZv1uhQqu0xz7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753377253; a=rsa-sha256; cv=none; b=W8sjOeFJg629dFIjou8P8j1rzltpv3PabFcNH+CD+kCgPvgcrEHTNhgKQNY7iyNwDYkIc5 51UhyRu1CL+7B7gq72cqCk4LtIrUmfBdmPCftK9J4/NjlKse1bW6SR7T+Co2y4Kgqe+v2l v9ZEDjNXjzbpsxaMyOogtfVHrXmWZjYO2PVMdkmfSmiET21Yd8vvbaMltnIQDwPFFmQ1Cw IKl/FTsvYYSkgQYtFr5KcyN92KPF5BThXdWDc0tI4LJ9y8h7sscfqgfDYqE0f+l7u5JmZw Z7lYZXhllLaxiVRFdxWzhn4X3emBMfS5S9nhamdol09Ga6FLQrw+Ilv2XF9xUg== 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 4bnyKK0hwlz16df; Thu, 24 Jul 2025 17:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56OHECXt074600; Thu, 24 Jul 2025 17:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56OHECBa074597; Thu, 24 Jul 2025 17:14:12 GMT (envelope-from git) Date: Thu, 24 Jul 2025 17:14:12 GMT Message-Id: <202507241714.56OHECBa074597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 188138106b9f - main - krb5: Remove a duplicate include of error_tables/Makefile.inc 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 188138106b9feb05bc2e51329295e41adbc95175 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=188138106b9feb05bc2e51329295e41adbc95175 commit 188138106b9feb05bc2e51329295e41adbc95175 Author: Cy Schubert AuthorDate: 2025-07-24 04:57:26 +0000 Commit: Cy Schubert CommitDate: 2025-07-24 16:31:39 +0000 krb5: Remove a duplicate include of error_tables/Makefile.inc And move the aggregation of its generated sources to the correct library, libkrb5.so. Fixes: ee3960cba106 --- krb5/lib/crypto/Makefile | 4 ---- krb5/lib/krb5/error_tables/Makefile.inc | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/krb5/lib/crypto/Makefile b/krb5/lib/crypto/Makefile index ed1cd7764012..4dda0d85da54 100644 --- a/krb5/lib/crypto/Makefile +++ b/krb5/lib/crypto/Makefile @@ -23,10 +23,6 @@ VERSION_MAP= ${.CURDIR}/version.map # .include "${KRB5_CRYPTOLIBDIR}/builtin/Makefile.inc" # .include "${KRB5_CRYPTOLIBDIR}/openssl/Makefile.inc" -.include "${KRB5_SRCTOP}/lib/krb5/error_tables/Makefile.inc" - -SRCS+= ${GEN_ET} - .include "${KRB5_SRCTOP}/lib/crypto/krb/Makefile.inc" .include "${KRB5_SRCTOP}/lib/crypto/builtin/Makefile.inc" .include "${KRB5_SRCTOP}/lib/crypto/openssl/Makefile.inc" diff --git a/krb5/lib/krb5/error_tables/Makefile.inc b/krb5/lib/krb5/error_tables/Makefile.inc index dee259798dae..5d2ec3b9e920 100644 --- a/krb5/lib/krb5/error_tables/Makefile.inc +++ b/krb5/lib/krb5/error_tables/Makefile.inc @@ -144,3 +144,5 @@ ${GEN_ASN1_ERR_C}: ${GEN_ASN1_ERR} ${COMPILE_ET} et-c-${.PREFIX}.et mv et-c-${.PREFIX}.c ${.PREFIX}.c rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c + +SRCS+= ${GEN_ET}