Attachment 238132 Details for Bug 267814 – This patch fixes the three build problems

[patch] This patch fixes the three build problems

0001-security-heimdal-Fix-build.patch (text/plain), 1.83 KB, created by Cy Schubert on 2022-11-17 01:42:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2022-11-17 01:42:45 UTC

Size: 1.83 KB

patch

obsolete

>From eeedc72137db1ee787dafc609c4b76e79cb23b8e Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Wed, 16 Nov 2022 17:34:53 -0800
>Subject: [PATCH] security/heimdal: Fix build
>
>Three problems were discovered when building under poudriere or in
>a clean jail.
>
>1. Python is now a prerequisite.
>
>2. liblockfile is now needed.
>
>3. clang-format is needed for asn1_compile. Unfortunately the base llvm
>   does not install clang-format so we need install $LLVM_DEFAULT to get
>   this file.
>
>PR:		267814
>Reported by:	many
>Fixes:		83f79ba0e0ca
>MFH:		2022Q4
>---
> security/heimdal/Makefile | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
>index f4d38c3ec0d4..14956859a0b2 100644
>--- a/security/heimdal/Makefile
>+++ b/security/heimdal/Makefile
>@@ -13,10 +13,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> CONFLICTS=	krb5 krb5-*
> 
> USES=		cpe gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \
>-		pkgconfig readline makeinfo ssl
>+		pkgconfig python readline makeinfo ssl
> CPE_VENDOR=	${PORTNAME}_project
> USE_LDCONFIG=	${GSSAPILIBDIR}
> 
>+# Needs clang-format which is only provided by the port.
>+# Else asm1_fails resulting in a command not found error.
>+BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
>+
>+LIB_DEPENDS=	liblockfile.so:devel/liblockfile
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	ac_cv_header_fnmatch_h=yes \
> 		ac_cv_header_db_h=no \
>@@ -39,7 +45,8 @@ CONFIGURE_ARGS=	--with-berkeley-db \
> 		--enable-pthread-support \
> 		--with-readline="${LOCALBASE}" \
> 		--with-hdbdir="/var/${PORTNAME}" \
>-		--sysconfdir="${PREFIX}/etc"
>+		--sysconfdir="${PREFIX}/etc" \
>+		CLANG_FORMAT="${LOCALBASE}/bin/clang-format${LLVM_DEFAULT}"
> # XXX --with-readline picks up libreadline even if found in /usr/lib.
> MAKE_ENV=	INSTALL_CATPAGES=no
> INSTALL_TARGET=	install-strip
>-- 
>2.38.1
>

Actions: View | Diff

Attachments on bug 267814: 238122 | 238123 | 238132 | 238144 | 238145 | 238147 | 238150