math/gismo: Update 21.12.0 -> 21.12.0-882

freebsd · Dec 12, 2022 · 3dc9e48 · 3dc9e48
1 parent 8f5b881
commit 3dc9e48
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 26 deletions.
diff --git a/math/gismo/Makefile b/math/gismo/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gismo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	21.12.0
+DISTVERSION=	21.12.0-882
+DISTVERSIONSUFFIX=	-g236b1b29
 CATEGORIES=	math # geometry
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake:testing compiler:c++14-lang
 USE_GITHUB=	yes
-USE_GCC=	yes # clang-11 crashes: https://bugs.llvm.org/show_bug.cgi?id=51468
 USE_LDCONFIG=	yes
 
 CMAKE_TESTING_ON=	GISMO_BUILD_UNITTESTS # one test is known to fail: https://github.com/gismo/gismo/issues/466

diff --git a/math/gismo/distinfo b/math/gismo/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1640112553
-SHA256 (gismo-gismo-v21.12.0_GH0.tar.gz) = 4001b4c49661ca8b71baf915e773341e115d154077bef218433a3c1d72ee4f0c
-SIZE (gismo-gismo-v21.12.0_GH0.tar.gz) = 4957758
+TIMESTAMP = 1670872067
+SHA256 (gismo-gismo-v21.12.0-882-g236b1b29_GH0.tar.gz) = f02d87009aa9f8bde44951ca9acd2e482d477f3695e1c102b96e154bce8e05b9
+SIZE (gismo-gismo-v21.12.0-882-g236b1b29_GH0.tar.gz) = 28362292
 SHA256 (gismo-gsElasticity-a94347d_GH0.tar.gz) = 4f8f88347fda4c31e7d366ab79ed19681d8cd4cdfc50947b7be8084e93aca169
 SIZE (gismo-gsElasticity-a94347d_GH0.tar.gz) = 281441
 SHA256 (gismo-gsKLShell-5247352_GH0.tar.gz) = 7b7f6764f21c28b276ec1b62fb4e66c3ae763c996bf473200ae4b0345024350f

diff --git a/math/gismo/files/patch-cmake_OptimizeForArchitecture.cmake b/math/gismo/files/patch-cmake_OptimizeForArchitecture.cmake
@@ -0,0 +1,11 @@
+--- cmake/OptimizeForArchitecture.cmake.orig	2022-12-12 19:13:40 UTC
++++ cmake/OptimizeForArchitecture.cmake
+@@ -116,7 +116,7 @@ macro(OFA_AutodetectX86)
+     string(REGEX REPLACE ".* Family ([0-9]+) .*" "\\1" _cpu_family "${_cpu_id}")
+     string(REGEX REPLACE ".* Model ([0-9]+) .*" "\\1" _cpu_model "${_cpu_id}")
+     string(REGEX REPLACE ".* Stepping ([0-9]+) .*" "\\1" _cpu_mstepping "${_cpu_id}")
+-  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+   if(_vendor_id STREQUAL "GenuineIntel")
+     if(_cpu_family EQUAL 6)
+       # taken from the Intel ORM
diff --git a/math/gismo/files/patch-cmake_gsConfig.cmake b/math/gismo/files/patch-cmake_gsConfig.cmake
@@ -0,0 +1,14 @@
+- -no-sse2 flag is added by cmake: https://github.com/gismo/gismo/issues/570
+- this triggers the clang crash: https://bugs.llvm.org/show_bug.cgi?id=51468
+
+--- cmake/gsConfig.cmake.orig	2022-12-12 19:15:56 UTC
++++ cmake/gsConfig.cmake
+@@ -263,7 +263,7 @@ endif()
+ #string(TOUPPER ${CMAKE_BUILD_TYPE} TEMP)
+ #message(STATUS "Using compilation flags: ${CMAKE_CXX_FLAGS}, ${CMAKE_CXX_FLAGS_${TEMP}}")
+
+-if("x${CMAKE_BUILD_TYPE}" STREQUAL "xRelease")
++if(FALSE AND "x${CMAKE_BUILD_TYPE}" STREQUAL "xRelease")
+   #https://github.com/VcDevel/Vc/blob/master/cmake/OptimizeForArchitecture.cmake
+   include( OptimizeForArchitecture )
+   OptimizeForArchitecture()
diff --git a/math/gismo/files/patch-src_gsIO_gsFileManager.cpp b/math/gismo/files/patch-src_gsIO_gsFileManager.cpp