From nobody Thu Nov 24 23:32:24 2022 X-Original-To: dev-commits-ports-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 4NJDmm5rVpz4jR4l; Thu, 24 Nov 2022 23:32:24 +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 4NJDmm5DTvz4Dbr; Thu, 24 Nov 2022 23:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669332744; 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=kNO7/oP536gMg85GMVKv87iZZLaGwzYNfuKLtNXVTfU=; b=Ri8v6mBNiXDSpVaD5tVkC0zGBbFnl5xXwTQhtkVrWS1wZx06uRt70Z69o+Uv2b8oT2SMZV Xk0aK+eeGeGqCnaXVLQLwLG7oTTqYw4N5LYkY1Ps6YH0l9m4odpg66qRV42pYVpN8b1ik2 v2EILBGU85WgcyzxnnKPzdsNLliwULElb6yO9jiYZOEBNr6f/L1B79766vpc+Y5h5jV1IO 4KojDAPYRLtQw9beft66sbUwB8Q7MzU2k7kWdpogHV2FzC3MKrY6zAodFR5W+VCbNaPusp UcvHoedBFvKbA2KBg+9r8rcU6gF8HLPcfgaA0UHuEAnZIdOaZpyeywnNhPyhZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669332744; 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=kNO7/oP536gMg85GMVKv87iZZLaGwzYNfuKLtNXVTfU=; b=seU0hX7g0o2nxqeQlXExxqEt4PSh15Pr0lvzP8lwg+B8dbs+VB8eB7i7XaxtpyrS9s5IRP Phr8W5RxljLlqqIByK46PdIAXc/q/Jkm+AJfmKkplx0ZMJIgg4CczB7rF3z7Ehpv70r/ed XuNIFa5zEbKf5dv/+KBuaviVNhBAxh1Xe66oY1l/cSsXUyHSkTsnvbW/C5VovGjkHp7TxC jPJ/XSr7NjE3Qv7WtoLMo2S+CVX6a0O3HvlyOUB7WfGwqt/kGbaqVcGZ2g+dS9GT8pPpLU vj1UBF32W818qbSYkOmfUGX0X6wJGBuDFrWX0bYQFIY1Lv+ytsB8OHp7o2QfYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669332744; a=rsa-sha256; cv=none; b=ix4Ct36e4Nas7hpuQfkdmfl/RbeEg0BRIx+zEqLmmJFI18wPPWkakoniUrqZFOCgPK+M0i N42aXnlUhK9BmFfb6+EfpjMSoOQQAKKz+TMlNmTVuNbLLMxsTSgN7/1RV++dDp4gfGG3fv IdE4qkedJ0o3TyIZ7JkMzgux55Xr1l9c2te/0/FeMEb586ydHZCOpPRJNaYDW8ta4fRxcC K3gQ3Zic1Yt+lH/yA6WJlu8q2cdnGE+Hd7dvqoKdzIY4kLJl0KNYTaW3eji/Lr7kH7WwVn /+hUr5i22TIAqzyBmYJzwQmtALXmyGXaPxiKjTe32ASSznint4ZB2kjLbDyFeg== 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 4NJDmm4KLwzKCK; Thu, 24 Nov 2022 23:32:24 +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 2AONWO4m034504; Thu, 24 Nov 2022 23:32:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AONWOZl034503; Thu, 24 Nov 2022 23:32:24 GMT (envelope-from git) Date: Thu, 24 Nov 2022 23:32:24 GMT Message-Id: <202211242332.2AONWOZl034503@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: 286254e283f6 - main - Partially revert "security/heimdal*: Remove LLVM_DEFAULT build prerequisite" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 286254e283f60ef160b572c8d76db06ac2b87c1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=286254e283f60ef160b572c8d76db06ac2b87c1a commit 286254e283f60ef160b572c8d76db06ac2b87c1a Author: Cy Schubert AuthorDate: 2022-11-24 20:36:25 +0000 Commit: Cy Schubert CommitDate: 2022-11-24 23:31:23 +0000 Partially revert "security/heimdal*: Remove LLVM_DEFAULT build prerequisite" The suggested workaround will only work when autoreconf is not run. The devel port still needs LLVM_DEFAULT while the non-devel port does not PR: 267814 Fixes: 22a683a337ef MFH: 2022Q4 This partially reverts commit 22a683a337efe7169b61de8c9ec63e2c0d561891. --- security/heimdal-devel/Makefile | 5 ++++- security/heimdal-devel/files/patch-configure.ac | 15 +++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/security/heimdal-devel/Makefile b/security/heimdal-devel/Makefile index 43a4a0a52cd8..c6ee912e8fb0 100644 --- a/security/heimdal-devel/Makefile +++ b/security/heimdal-devel/Makefile @@ -23,7 +23,10 @@ USES= autoreconf:build cpe gettext-runtime gssapi:bootstrap,heimdal \ CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= ${GSSAPILIBDIR} -BUILD_DEPENDS= p5-JSON>0:converters/p5-JSON +# 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} \ + p5-JSON>0:converters/p5-JSON GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_fnmatch_h=yes \ diff --git a/security/heimdal-devel/files/patch-configure.ac b/security/heimdal-devel/files/patch-configure.ac index b616d032b93a..048b6c83b622 100644 --- a/security/heimdal-devel/files/patch-configure.ac +++ b/security/heimdal-devel/files/patch-configure.ac @@ -1,15 +1,6 @@ ---- configure.ac.orig 2022-11-17 16:55:32.000000000 -0800 -+++ configure.ac 2022-11-24 07:19:25.053801000 -0800 -@@ -19,7 +19,7 @@ - AM_PROG_CC_C_O - AC_PROG_CPP - AM_PATH_PYTHON --AC_CHECK_PROG(CLANG_FORMAT, clang-format, [clang-format], [no]) -+AC_CHECK_PROG(CLANG_FORMAT, clang-format, [clang-format], []) - test "$CLANG_FORMAT" = no && CLANG_FORMAT=true - - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -@@ -177,6 +177,7 @@ +--- configure.ac.orig 2019-06-07 06:21:39 UTC ++++ configure.ac +@@ -153,6 +153,7 @@ AC_ARG_ENABLE(kx509, if test "$enable_kx509" != no ;then AC_DEFINE([KX509], 1, [Define to enable kx509.]) fi