Skip to content

Commit aa89f3c

Browse files
authored
Merge pull request #11371 from hajgato/make_el8
Really fix make 4.2.1 on RHEL 8
2 parents 44ebac0 + 3222dd3 commit aa89f3c

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

easybuild/easyconfigs/m/make/make-4.2.1-GCCcore-8.3.0.eb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ sources = [SOURCE_TAR_BZ2]
2424
patches = ['%(name)s-%(version)s_RHEL8.patch']
2525
checksums = [
2626
'd6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589', # make-4.2.1.tar.bz2
27-
'f564f16443979c8398ed325b5d3cd2d6683ca5400433fc67fa29492d2cc4c9ea', # make-4.2.1_RHEL8.patch
27+
'ca9daea8cfdb7de55c5a973e283a5aca35fb11d9eb37cd3bd25f95557f2e6479', # make-4.2.1_RHEL8.patch
2828
]
2929

3030
builddependencies = [
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
# http://gnu-make.2324884.n4.nabble.com/undefined-reference-to-alloca-td18308.html
2-
# SEP 16th 2020 by B. Hajgato (UGent)
3-
diff --git a/configure.ac.orig b/configure.ac
4-
index 64ec870..870a70a 100644
5-
--- a/configure.ac.orig
6-
+++ b/configure.ac
7-
@@ -402,7 +402,7 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
8-
#define GLOB_INTERFACE_VERSION 1
9-
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
10-
# include <gnu-versions.h>
11-
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
12-
+# if _GNU_GLOB_INTERFACE_VERSION >= GLOB_INTERFACE_VERSION
13-
gnu glob
14-
# endif
15-
#endif],
1+
https://github.com/osresearch/heads/issues/352
2+
https://github.com/osresearch/heads/blob/make-4.2.1/patches/make-4.2.1.patch
3+
--- clean/make-4.2/glob/glob.c 2013-10-20 17:14:38.000000000 +0000
4+
+++ make-4.2/glob/glob.c 2018-09-18 10:16:03.860886356 +0000
5+
@@ -208,7 +208,7 @@
6+
#endif /* __GNU_LIBRARY__ || __DJGPP__ */
7+
8+
9+
-#if !defined __alloca && !defined __GNU_LIBRARY__
10+
+#if !defined __alloca && defined __GNU_LIBRARY__
11+
12+
# ifdef __GNUC__
13+
# undef alloca

0 commit comments

Comments
 (0)