From nobody Tue Mar 07 08:01:25 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 4PW7F16698z3x48V; Tue, 7 Mar 2023 08:01:25 +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 4PW7F15fYcz4Nvt; Tue, 7 Mar 2023 08:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678176085; 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=anxV5FbyxR9A1IMgeJu+sUwUvPdY8DBz4bII6h/39NY=; b=nVnkM7u3ek61Nu0EeiLWdJytR0wz764rjJ4Go8GCLShFzP0U2RA7okeEbHG5IjqXhAwEQ1 T5TCPj8IjrC3cysLLtJbYJPRKU9ikqjxPQMI0XhG8T3ermmsJ29JyvYvIeMn27TgAL9zZp C+wOd7rUt5isXlqHYXAJH8wqFSqQq+wX5MD+b6BhCcU7qpQnEzZi2qywjDmv5f+RPYvmar DbhxaEAe57mRHc04fo8DlmuhK5GWrHYjzmsdCZbu65DuT2Yv6+W7n720hQEKtzDvPEHXZD 13OvWFvFXpIe/21DttmN6VBdYa4K5sOkoFd9aQRtFSxhSrwNUa0N2kREUZbo6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678176085; 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=anxV5FbyxR9A1IMgeJu+sUwUvPdY8DBz4bII6h/39NY=; b=dP/0GDFiY7Q4TbJGfGSQblS+8zR1WE4mG2RJ7QPtZPLdy9vcMNlKGUBEy5E+pCYn3scZjw pH84IlVjf4WGeFWc+uWvNvuLJrhW/Xez8uOTJYfMH8bjYQjlcx/XBG+WjrLY88Nm6kui/b iB5S4TWVGD1a8fRmQaO/0sMPUbJ5E5ZVXG0ci1PwzLkMYGKcyVHXE70mFcn/vYywEBuE88 30gpXkbO5BZ988YZCGEW1WyOws+ZhTmdde1WHzrEtGksfC10foYnpU97LdBdKw2MR+HpHr 1xHgZyZZcSN5x789n16EZIwPkhm1Zy4iwSaPqGPfpzwhRDN3c6epJSaE1Q19fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678176085; a=rsa-sha256; cv=none; b=aJwtJ7rnXLgl3LJ4ZfyMHcYB86jFGRrnjJ59KwVC1ca7C4O0pQKJ5n/OECNuDlXys+Sm+b fEP+JWd2Hw+7Ag0PEg8AuspDlf78/dVh974w+1qlgSCoGgQ9hO9wYXTTQvS3YtMk2rU4fU fvqwt44y1L0QrlXNmj/toMeAEOIiT9lBJ+OKlBHlowfAouO185fAylhQoRDTlq4DZA35QI s59dBzx+kiUeyQIXdPVrRi5ZI7ZnqNwkNOig4r089zCRYKt3T7AWI4VkLdhw3DnC0SOYn/ xCMlnk1wboOiznjOH54029NRWHhZLA1UbXCkuiGEq9acc11955dmcw0xFpR6fw== 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 4PW7F14kFCzc7x; Tue, 7 Mar 2023 08:01:25 +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 32781PUi048528; Tue, 7 Mar 2023 08:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32781POb048527; Tue, 7 Mar 2023 08:01:25 GMT (envelope-from git) Date: Tue, 7 Mar 2023 08:01:25 GMT Message-Id: <202303070801.32781POb048527@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 354c8ccfa6ae - main - devel/root: Fix configure on powerpc 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 354c8ccfa6ae3b16d402dbbaf726746c583e4041 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=354c8ccfa6ae3b16d402dbbaf726746c583e4041 commit 354c8ccfa6ae3b16d402dbbaf726746c583e4041 Author: Erik Jensen AuthorDate: 2023-03-07 07:56:45 +0000 Commit: Nuno Teixeira CommitDate: 2023-03-07 07:58:22 +0000 devel/root: Fix configure on powerpc ROOT version 6.26/06 fails to be configured on powerpc: https://pkg-status.freebsd.org/foul1/data/131powerpc64-quarterly/ef59ef166670/logs/root-6.26.06.log This patch fixes the reported error for ROOT version >= 6.28/00 PR: 269947 --- devel/root/files/patch-cmake_modules_SetUpLinux.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/devel/root/files/patch-cmake_modules_SetUpLinux.cmake b/devel/root/files/patch-cmake_modules_SetUpLinux.cmake index a222e7c5f3c0..e0ff27d26273 100644 --- a/devel/root/files/patch-cmake_modules_SetUpLinux.cmake +++ b/devel/root/files/patch-cmake_modules_SetUpLinux.cmake @@ -1,6 +1,6 @@ ---- cmake/modules/SetUpLinux.cmake.orig 2022-11-16 10:35:46 UTC +--- cmake/modules/SetUpLinux.cmake.orig 2023-02-13 15:21:06 UTC +++ cmake/modules/SetUpLinux.cmake -@@ -6,7 +6,7 @@ set(ROOT_PLATFORM linux) +@@ -6,7 +6,7 @@ set(ROOT_PLATFORM linux) @@ -9,6 +9,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL Intel) set(ROOT_ARCHITECTURE linuxx8664icc) else() +@@ -23,7 +23,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) + set(ROOT_ARCHITECTURE linuxarm64) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm) + set(ROOT_ARCHITECTURE linuxarm) +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ppc64) ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ppc64 OR CMAKE_SYSTEM_PROCESSOR MATCHES powerpc64) + set(ROOT_ARCHITECTURE linuxppc64gcc) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES s390x) + set(ROOT_ARCHITECTURE linuxs390xgcc) @@ -103,6 +103,10 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang) endif()