From nobody Thu Nov 17 02:31:05 2022 X-Original-To: dev-commits-ports-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 4NCP6f1F2Zz4hqvF; Thu, 17 Nov 2022 02:31: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 4NCP6f0QWDz3LDk; Thu, 17 Nov 2022 02:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668652266; 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=TDHsHoCBfMFB0kejp+6XQ8gTgt8jidh7LKsM0omKXXc=; b=Kza7Z62qiunJHx5ldT6Yq53ZvIN4W6sJw/ChHnPBVr/G074eSAuUQ/h8zogVmp+of59ysY 0+5RJ0mTHukSg2Ta1VlyIr9ugoKd3TZeUxh5xQLkwmfJiCrGLWOR6IhOuz4g7H/GOObZVu gIHkgMSXSgiBFzWQFyqeAUEy2BdjZd7hrnQawVcClJiPL5wqkIy0TIcXNoCamrsBXyJVCV avaXvQceXhL5qKh2l0rIUQyv8hRrCJF4djX00X/sfFVXypszc+/39N4qr1TEU49qo5o0Su 2HEawsNA+QvdkzVXOuUtGeFR2jEPyPBXMoT/uL2+qIGCj3j1tEoZi6DH/B9/Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668652266; 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=TDHsHoCBfMFB0kejp+6XQ8gTgt8jidh7LKsM0omKXXc=; b=fLCI+PWZcWyco//1/J9L362d720dGdKehF7PVssHElq/4560H3c9ytHNMToTirZ7YKyO+G 14u3mGHU+pG0NmdLl8HLKju110PtFYtJraEjheZvHsiv+E4plKHSnmu2qLAexWrBj3wuGu oNTeFT58c2sCdQhhEn0CHIhpHR8Euq5UZPMtjByfPuogXfjxIVHaSmMiftVzO0mmrH6iq3 mtH6+wcMhuIhyN9CqPcv8eoql6ylmgTDu2jtEE91PIYEEY5VJ9QtCo0rbKMKiCyalTbtNY H2lVBY2MuuLPYcKjUEY4gsmffD8HiMbsnDQxC/MYDaD/Pqo8nKBUsGWNPJdfsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668652266; a=rsa-sha256; cv=none; b=uf1WiVt6gROW903TKvRlYT1O3s4QY2Ni48zfypVZ6rRUMIIJwrOlVO93lTrvDSuEXxp2P6 36HZnZaav8g3tSiC8j3Ts3gPnubKgQE5/AI3B9xT1tKkdjx35vYbmFNo6zczhnQ1+AtWzL XJYsNa20jMXHm/CmGuXitWm27W3jRlNwVNG6McfEfZ8+3qtHXNxVWFmeeSzUYV1bekLzkF mGc/205QHB+iaTgZGOgE//WFpTfuezJ+Frhg0ZjfclYQHne8rrAbSTMf8D5jyIkUItqb0A JpU18hLApmbhbWldPkZ3djeEZLs/ugxXNkqzaYSPxTjtUItaVJd0cHxyZO/fxw== 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 4NCP6d6c1FzPvp; Thu, 17 Nov 2022 02:31:05 +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 2AH2V5ub030380; Thu, 17 Nov 2022 02:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AH2V5mv030379; Thu, 17 Nov 2022 02:31:05 GMT (envelope-from git) Date: Thu, 17 Nov 2022 02:31:05 GMT Message-Id: <202211170231.2AH2V5mv030379@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: a5523d807d01 - main - security/heimdal: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5523d807d01b1ed31614f346db2b348d7046420 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5523d807d01b1ed31614f346db2b348d7046420 commit a5523d807d01b1ed31614f346db2b348d7046420 Author: Cy Schubert AuthorDate: 2022-11-17 01:34:53 +0000 Commit: Cy Schubert CommitDate: 2022-11-17 02:21:36 +0000 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