From nobody Thu Apr 20 13:35:43 2023 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 4Q2JZR664jz4655M; Thu, 20 Apr 2023 13:35:43 +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 4Q2JZR31TRz44hq; Thu, 20 Apr 2023 13:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997743; 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=Z92TACQQ0HGSMUeUp5+y9RR+Y8YBG/3FbLH+y8IMUeQ=; b=sMdqK6+upldM6VKOwTvQlTrT+S/tyVYbVNOWNjC1f4jQr8EwiLfPdcB/3dmOalQPGhhlcZ wTrbGNURKuAy8AVmU6+d4sMORrpk2CGwWtygXZpQJ11slAQBjYw9jyj/Y6xF3ZLJv400qq DoVaFIS7yoQfDXUSNpBGMEXU31FJJ1rj1zpbe5fZHiDTftljQBSL2/INSsn+WaKHcmxhtD v5QPQ3YQpAhs6xKK7Xxi0+MFyxkZUaMYrYronSx2OZ6fFyfhFosNPLt5cASKCFoETu7Lth M8LmtQywgvNu3sQnEUpA72JNvzEXyClyrvDdj9Y6E7eUENgprNptL2mHAsfvZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997743; 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=Z92TACQQ0HGSMUeUp5+y9RR+Y8YBG/3FbLH+y8IMUeQ=; b=FN74+bzC/UEh2o6QWemNCcbLv6ASR84NLpVfMUzepMZTAH5A7nS9UYlLbs7QqdBKiXPT94 Oh9jKPagahAcOl812inBigmsWzCqccpCoLhFy88bwFsEiGME3tL1sgHyYp55EyqKZUUvOm EgHKBlQsIoRa0drk+oFeEfXvHxBnFrXZagJDN+3WC4w64UTPIwJJGRSW+ObpaDGMdbxhuX OziZfUhc7MPLwDvNCTP9J5/ItnWINLA8UspJ8ibEJMn215pQJbzCqkz3tHbwsEww15Os/X 1w4nphLzLbDE0lLHiXcdVbNVG/FZGuVJ78OEtoCXGVi5ZDS2EBhPU8zQHNp7YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681997743; a=rsa-sha256; cv=none; b=dZBRSfZd0ynOn16wH0PXXJ3Ra/SiTARWpA5vxlXGi1zA+/g3tq9ZYyJHRQ/yS4vlQQ7vV6 Y3+BIRi+XU6I7uXsAhFYGPfo8i2VM0dt2RrqIH3Zr5k7XoYYKnOwUhpPEzQs0Cl1gklaqL zcf57X3ZOjY6uqSm67gwwFpZp8iDRJ5ekYeXL2FhVKWUgjQfsBuWfHj3x6ZZpVk7+jj1oA r/5Sf0au9UydKNb96uW/+uZZC1Wv86zLcsizJzTf0Kd93ipG4C6jSMPFCJdV9IADc7lwxQ 2do1Fpx+BrLNoVgKmBExgPdGPcmEcfGaq8Cxesa/wkTpPGidBTMM0IlpnDXT7A== 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 4Q2JZR22L5zf4s; Thu, 20 Apr 2023 13:35:43 +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 33KDZhHC081564; Thu, 20 Apr 2023 13:35:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KDZhDB081563; Thu, 20 Apr 2023 13:35:43 GMT (envelope-from git) Date: Thu, 20 Apr 2023 13:35:43 GMT Message-Id: <202304201335.33KDZhDB081563@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 221dac0087ec - main - security/cryptlib: fix build on armv6/armv7 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 221dac0087ec47c24c00074a6c66479cae9c227b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=221dac0087ec47c24c00074a6c66479cae9c227b commit 221dac0087ec47c24c00074a6c66479cae9c227b Author: Robert Clausecker AuthorDate: 2023-04-19 12:00:49 +0000 Commit: Robert Clausecker CommitDate: 2023-04-20 11:49:22 +0000 security/cryptlib: fix build on armv6/armv7 The clang option -fsanitize=safe-stack is not supported on armv6/armv7. Patch the option detection script to not enable it there. Approved by: portmgr (build fix blanket) --- security/cryptlib/files/patch-tools_ccopts.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/security/cryptlib/files/patch-tools_ccopts.sh b/security/cryptlib/files/patch-tools_ccopts.sh index f0c1781caf8f..ba77cf411fb5 100644 --- a/security/cryptlib/files/patch-tools_ccopts.sh +++ b/security/cryptlib/files/patch-tools_ccopts.sh @@ -1,5 +1,14 @@ --- tools/ccopts.sh.orig 2021-10-21 02:27:26 UTC +++ tools/ccopts.sh +@@ -675,7 +675,7 @@ hasSafeStackLibs() + + if [ $ISCLANG -gt 0 ] && [ $ISSPECIAL -eq 0 ] ; then + if [ $COMPILER_VER -ge 47 ] ; then +- if [ "$OSNAME" = "Darwin" ] || [ "$OSNAME" = "OpenBSD" ] ; then ++ if [ "$OSNAME" = "Darwin" ] || [ "$OSNAME" = "OpenBSD" ] || [ "$OSNAME" = "FreeBSD" -a "$ARCH" = "arm" ] ; then + # The versions of clang shipped with OS X or OpenBSD don't + # support -fsanitize=safe-stack even as late as clang 12, so + # there's not much that we can do. @@ -892,31 +892,6 @@ fi # a big deal. As a convenient side-effect, this also enables the use of # ASLR where it's supported.