Date: Sun, 10 Aug 2025 15:37:14 GMT From: Lexi Winter <ivy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 10eecc467f32 - main - krb5: Don't install gssapi.h twice Message-ID: <202508101537.57AFbErj067146@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=10eecc467f3214d709283fff05ed2c81abe8408b commit 10eecc467f3214d709283fff05ed2c81abe8408b Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2025-08-10 12:25:24 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> CommitDate: 2025-08-10 15:36:39 +0000 krb5: Don't install gssapi.h twice Currently we install /usr/include/gssapi/gssapi.h twice, once in krb5/include/gssapi and once in krb5/lib/gssapi. The version in krb5/include/gssapi is wrong: make searches ${.PATH} and picks crypto/krb5/src/include/gssapi.h to install, but this is the file which is supposed to be installed in /usr/include/gssapi.h. The problem was masked by the fact that we install the correct gssapi/gssapi.h later in krb5/lib/gssapi. Remove gssapi.h and the unneeded ${.PATH} entry from krb/include/gssapi and while here, remove the unused GSSAPI_KRB5 include group. This change does not affect the ultimate result of installworld, it just avoids installing the same file twice with different content. PR: 288594 Reviewed by: brooks, des Differential Revision: https://reviews.freebsd.org/D51840 --- krb5/include/gssapi/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/krb5/include/gssapi/Makefile b/krb5/include/gssapi/Makefile index b181187e9d95..997cbc06c389 100644 --- a/krb5/include/gssapi/Makefile +++ b/krb5/include/gssapi/Makefile @@ -10,14 +10,11 @@ .include "../Makefile.inc" .PATH: ${KRB5_DIR}/lib/gssapi/krb5 \ - ${KRB5_DIR}/lib/gssapi/generic \ - ${KRB5_DIR}/include + ${KRB5_DIR}/lib/gssapi/generic -INCSGROUPS= INCS GSSAPI_KRB5 INCSDIR= ${INCLUDEDIR}/gssapi -INCS= gssapi.h \ - gssapi_alloc.h \ +INCS= gssapi_alloc.h \ gssapi_ext.h \ gssapi_generic.h \ gssapi_krb5.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202508101537.57AFbErj067146>