zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wget: replacing prior workaround with proper fix (#31699)

Browse Source 
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
This commit is contained in:
snehring 2022-07-25 03:29:28 -05:00 committed by GitHub
parent cd4d657c2f
commit fe0643a14e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
var/spack/repos/builtin/packages/wget/gnulib.patch Normal file
View File

@ -0,0 +1,39 @@
From 84863a1c4dc8cca8fb0f6f670f67779cdd2d543b Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 30 Apr 2022 14:09:00 +0200
Subject: [PATCH] string: Avoid syntax error on glibc systems with GCC 11.
Reported by Tom Tromey <tromey@adacore.com> in
<https://lists.gnu.org/archive/html/bug-gnulib/2022-04/msg00075.html>
and by Satadru Pramanik <satadru@umich.edu> in
<https://lists.gnu.org/archive/html/bug-gnulib/2022-04/msg00076.html>.
* lib/string.in.h (strndup): Don't rededeclare strndup if it is defined
as a macro.
---
ChangeLog | 10 ++++++++++
lib/string.in.h | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/string.in.h b/lib/string.in.h
index b6840fa91..33160b252 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -583,7 +583,7 @@ _GL_FUNCDECL_RPL (strndup, char *,
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
_GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
# else
-# if !@HAVE_DECL_STRNDUP@ || __GNUC__ >= 11
+# if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup)
_GL_FUNCDECL_SYS (strndup, char *,
(char const *__s, size_t __n)
_GL_ARG_NONNULL ((1))
@@ -593,7 +593,7 @@ _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
# endif
_GL_CXXALIASWARN (strndup);
#else
-# if __GNUC__ >= 11
+# if __GNUC__ >= 11 && !defined strndup
/* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */
_GL_FUNCDECL_SYS (strndup, char *,
(char const *__s, size_t __n)

12
var/spack/repos/builtin/packages/wget/package.py
View File

@ -53,15 +53,9 @@ class Wget(AutotoolsPackage, GNUMirrorPackage):
build_directory = 'spack-build'
def flag_handler(self, name, flags):
# gcc11 defaults to c17, which breaks compilation with older
# glibc versions as shipped with rhel7 and likely other OS
# versions too, feel free to add as necessary
older_glibc = self.spec.satisfies('os=rhel7') or \
self.spec.satisfies('os=centos7')
if self.spec.satisfies('%gcc@11:') and older_glibc and name.lower() == 'cflags':
flags.append(self.compiler.c11_flag)
return (None, None, flags)
# gnulib bug introced in commit cbdb5ea63cb5348d9ead16dc46bedda77a4c3d7d
# fix is from commit 84863a1c4dc8cca8fb0f6f670f67779cdd2d543b
patch('gnulib.patch', when='@1.21.3')
def configure_args(self):
spec = self.spec