From nobody Mon Dec 5 20:09:22 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 4NQvlQ73D1z4jNtK; Mon, 5 Dec 2022 20:09:22 +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 4NQvlQ6cjyz3kTj; Mon, 5 Dec 2022 20:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270962; 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=HOg8Iwz/LyRkDJip3Tnmq459B04gFxHvKjzfOPNZ+uc=; b=qo5RAx3xF8oaBkzBMz96+Eh8HUZVksbwu9CPjOhpVbmgi+Ir/4MIkcIQk1J/aLC3Dlhy9T R9Pd5/J1fb63FFoSXVfLjeaTT79jFRYS/oIi7OZUhkFQXylUVg2tqlGmqD6BLRXFHkigDm yaMYeXt9OHvS4utApQ5LWqR8PZa6ierFFXLCt91WvxtnQONr4c+ks4LuzmtxKoHkIk1YK4 xfMckv4RgN60qjDG/hhLEpRcwVF6eB/p67hhpqJ7PsSKm2xSkluCgfj8bZrtJ9PyHbE8j+ XMJzEBuThYS01pJuiRRAFcQ0CdEAaHZexHtuuKVwsFB3lDGyEo1hnwM5tGWnzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270962; 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=HOg8Iwz/LyRkDJip3Tnmq459B04gFxHvKjzfOPNZ+uc=; b=yg6mgcRTK2Bsa3ymw/vKqC9LGWK7YROGGnRNe6seJed8WBbI7Gdt/2uR1z1GWYydoiKzIC laB8y0ZPAQVAIBrZv8+stACFsPe3QAYfYq6+6lrCQv08JOBeVP6uZzJZdH2085zLjqkhJT GrZkIZkU9va2uEKM/dP9ghfxtlmqoFCHaoqZakMsbPLJL4SHS5z/XECO28m4WuylZdmr0y mNgmsFTmRPEW2M+gw4M57G2EJuTxFtUnMpEaJpLuRsshZbo18B+PzUR19T48FeLwuPfj2J pVPPpntNhdJEi6RMIlzsB8UflZObprdpwkCovm7I8jixW1HP7eP1bYI65C489w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670270962; a=rsa-sha256; cv=none; b=gNZqOSJtxh4Ppp4lx+Rk1GS9hlT6mrYw3Hfw8Az3N0IKMnigUeXoVk51pvDIODwrAqMwsx RDGlRB1nzm+muYAp7diy1nYJFFdnJWvtPt6FT8gqs1jaVhNUAXqDTY7wpPY8SXGmuxB090 mkc3odrf0sTfs2IpXqAmy+tZ3SGV1HjyX5899qvTVGdreukJ36+wWZTir3kB+0puvhxekJ Ktf2hACv2brk0oGeK/hrQmik1zWXSrfwJAQvRQQjeaIadshtaX9y/kXEDVHI1xqpmzypMF 2ncgfbWXyh0cNGjuDDBIGd0iFECl73O5WCGcy2cBKSHVk4YjJksxaB6yiLUrBQ== 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 4NQvlQ5jqRz198k; Mon, 5 Dec 2022 20:09:22 +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 2B5K9MPm042584; Mon, 5 Dec 2022 20:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5K9MSW042583; Mon, 5 Dec 2022 20:09:22 GMT (envelope-from git) Date: Mon, 5 Dec 2022 20:09:22 GMT Message-Id: <202212052009.2B5K9MSW042583@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 3c82f0cb8a25 - 2022Q4 - Partially revert "security/heimdal*: Remove LLVM_DEFAULT build prerequisite" 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/2022Q4 X-Git-Reftype: branch X-Git-Commit: 3c82f0cb8a253f74f2befa66c4ea1d654ce5ec9c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c82f0cb8a253f74f2befa66c4ea1d654ce5ec9c commit 3c82f0cb8a253f74f2befa66c4ea1d654ce5ec9c Author: Cy Schubert AuthorDate: 2022-11-24 20:36:25 +0000 Commit: Cy Schubert CommitDate: 2022-12-05 20:06:15 +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 This partially reverts commit 22a683a337efe7169b61de8c9ec63e2c0d561891. (cherry picked from commit 286254e283f60ef160b572c8d76db06ac2b87c1a) --- 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 9910558554e5..96ddcd0afc64 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