Mercurial > hg > orthanc

comparison OrthancFramework/Resources/Patches/dcmtk-3.6.6.patch @ 4968:1b6b88f017b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
try to fix dcmtk build for Apple M1
author Alain Mazy <am@osimis.io>
date Mon, 28 Mar 2022 21:20:48 +0200
parents b6818bbef7b8
children
comparison
equal deleted inserted replaced
4967:6119ecbd4462 4968:1b6b88f017b9
148 -#if defined(_WIN32) || defined(__hpux) 148 -#if defined(_WIN32) || defined(__hpux)
149 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__) 149 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
150 this->setvbuf(NULL, _IOLBF, 0); 150 this->setvbuf(NULL, _IOLBF, 0);
151 #else 151 #else
152 :: setlinebuf(file_); 152 :: setlinebuf(file_);
153
154 diff -urEb dcmtk-3.6.6.orig/config/tests/arith.cc dcmtk-3.6.6/config/tests/arith.cc
155 --- dcmtk-3.6.6.orig/config/tests/arith.cc 2022-03-28 19:17:03.000000000 +0000
156 +++ dcmtk-3.6.6/config/tests/arith.cc 2022-03-28 19:18:12.000000000 +0000
157 @@ -40,7 +40,7 @@
158 #include <ieeefp.h>
159 #endif
160
161 -#ifdef __APPLE__
162 +#if defined(__APPLE__) && !defined(__aarch64__)
163 // For controlling floating point exceptions on OS X.
164 #include <xmmintrin.h>
165 #endif
166 @@ -340,7 +340,7 @@
167 #ifdef HAVE_WINDOWS_H
168 _clearfp();
169 _controlfp( _controlfp(0,0) & ~_EM_INVALID, _MCW_EM );
170 -#elif defined(__APPLE__)
171 +#elif defined(__APPLE__) && !defined(__aarch64__)
172 _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID );
173 #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
174 feenableexcept( FE_INVALID );
175 @@ -382,7 +382,7 @@
176 _controlfp( _controlfp(0,0) | _EM_INVALID, _MCW_EM );
177 #elif defined(HAVE_FENV_H)
178 feclearexcept( FE_INVALID );
179 -#ifdef __APPLE__
180 +#if defined(__APPLE__) && !defined(__aarch64__)
181 _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() | _MM_MASK_INVALID );
182 #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
183 fedisableexcept( FE_INVALID );