patches to apply to gdbm and m4 when using oneapi compiler (#21740)
This commit is contained in:
parent
8e3ac8577f
commit
3364e5550f
@ -30,6 +30,7 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage):
|
|||||||
patch('gdbm.patch', when='%clang@11:')
|
patch('gdbm.patch', when='%clang@11:')
|
||||||
patch('gdbm.patch', when='%cce@11:')
|
patch('gdbm.patch', when='%cce@11:')
|
||||||
patch('gdbm.patch', when='%aocc@2:')
|
patch('gdbm.patch', when='%aocc@2:')
|
||||||
|
patch('gdbm.patch', when='%oneapi')
|
||||||
|
|
||||||
def configure_args(self):
|
def configure_args(self):
|
||||||
|
|
||||||
|
18
var/spack/repos/builtin/packages/m4/oneapi.patch
Normal file
18
var/spack/repos/builtin/packages/m4/oneapi.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
--- a/lib/xalloc-oversized.h 2020-08-07 11:04:56.154698639 -0700
|
||||||
|
+++ b/lib/xalloc-oversized.h 2020-08-07 11:06:11.667997389 -0700
|
||||||
|
@@ -46,13 +46,13 @@
|
||||||
|
positive and N must be nonnegative. This is a macro, not a
|
||||||
|
function, so that it works correctly even when SIZE_MAX < N. */
|
||||||
|
|
||||||
|
-#if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)
|
||||||
|
+#if ((7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) && !defined __INTEL_LLVM_COMPILER)
|
||||||
|
# define xalloc_oversized(n, s) \
|
||||||
|
__builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
|
||||||
|
#elif ((5 <= __GNUC__ \
|
||||||
|
|| (__has_builtin (__builtin_mul_overflow) \
|
||||||
|
&& __has_builtin (__builtin_constant_p))) \
|
||||||
|
- && !__STRICT_ANSI__)
|
||||||
|
+ && !__STRICT_ANSI__ && !defined __INTEL_LLVM_COMPILER)
|
||||||
|
# define xalloc_oversized(n, s) \
|
||||||
|
(__builtin_constant_p (n) && __builtin_constant_p (s) \
|
||||||
|
? __xalloc_oversized (n, s) \
|
@ -18,6 +18,7 @@ class M4(AutotoolsPackage, GNUMirrorPackage):
|
|||||||
patch('gnulib-pgi.patch', when='@1.4.18')
|
patch('gnulib-pgi.patch', when='@1.4.18')
|
||||||
patch('pgi.patch', when='@1.4.17')
|
patch('pgi.patch', when='@1.4.17')
|
||||||
patch('nvhpc.patch', when='%nvhpc')
|
patch('nvhpc.patch', when='%nvhpc')
|
||||||
|
patch('oneapi.patch', when='%oneapi')
|
||||||
# from: https://github.com/Homebrew/homebrew-core/blob/master/Formula/m4.rb
|
# from: https://github.com/Homebrew/homebrew-core/blob/master/Formula/m4.rb
|
||||||
# Patch credit to Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
# Patch credit to Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||||
patch('secure_snprintf.patch', when='os = highsierra')
|
patch('secure_snprintf.patch', when='os = highsierra')
|
||||||
|
Loading…
Reference in New Issue
Block a user