Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Mar 2023 08:01:25 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 354c8ccfa6ae - main - devel/root: Fix configure on powerpc
Message-ID:  <202303070801.32781POb048527@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=354c8ccfa6ae3b16d402dbbaf726746c583e4041

commit 354c8ccfa6ae3b16d402dbbaf726746c583e4041
Author:     Erik Jensen <erik@tenku.dk>
AuthorDate: 2023-03-07 07:56:45 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
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()
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303070801.32781POb048527>