# HG changeset patch # User Alain Mazy # Date 1648495248 -7200 # Node ID 1b6b88f017b9b0457fb454d578e61e94ba476641 # Parent 6119ecbd44621fed6a4b885172b147917fd5f993 try to fix dcmtk build for Apple M1 diff -r 6119ecbd4462 -r 1b6b88f017b9 OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch --- a/OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch Sat Mar 26 09:31:54 2022 +0100 +++ b/OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch Mon Mar 28 21:20:48 2022 +0200 @@ -150,3 +150,34 @@ this->setvbuf(NULL, _IOLBF, 0); #else :: setlinebuf(file_); + +diff -urEb dcmtk-3.6.6.orig/config/tests/arith.cc dcmtk-3.6.6/config/tests/arith.cc +--- dcmtk-3.6.6.orig/config/tests/arith.cc 2022-03-28 19:17:03.000000000 +0000 ++++ dcmtk-3.6.6/config/tests/arith.cc 2022-03-28 19:18:12.000000000 +0000 +@@ -40,7 +40,7 @@ + #include + #endif + +-#ifdef __APPLE__ ++#if defined(__APPLE__) && !defined(__aarch64__) + // For controlling floating point exceptions on OS X. + #include + #endif +@@ -340,7 +340,7 @@ + #ifdef HAVE_WINDOWS_H + _clearfp(); + _controlfp( _controlfp(0,0) & ~_EM_INVALID, _MCW_EM ); +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) && !defined(__aarch64__) + _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID ); + #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT) + feenableexcept( FE_INVALID ); +@@ -382,7 +382,7 @@ + _controlfp( _controlfp(0,0) | _EM_INVALID, _MCW_EM ); + #elif defined(HAVE_FENV_H) + feclearexcept( FE_INVALID ); +-#ifdef __APPLE__ ++#if defined(__APPLE__) && !defined(__aarch64__) + _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() | _MM_MASK_INVALID ); + #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT) + fedisableexcept( FE_INVALID );