diff options
| author | snehring <7978778+snehring@users.noreply.github.com> | 2022-07-25 03:29:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-25 10:29:28 +0200 |
| commit | fe0643a14ea46ece6bc1197cc99c39e217dea696 (patch) | |
| tree | 811a8014f20bf955149c5ffba38bd04799189079 /var | |
| parent | cd4d657c2fdbd6fbf966d00e32a69cd3a810f3be (diff) | |
| download | spack-fe0643a14ea46ece6bc1197cc99c39e217dea696.tar.gz spack-fe0643a14ea46ece6bc1197cc99c39e217dea696.tar.bz2 spack-fe0643a14ea46ece6bc1197cc99c39e217dea696.tar.xz spack-fe0643a14ea46ece6bc1197cc99c39e217dea696.zip | |
wget: replacing prior workaround with proper fix (#31699)
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/wget/gnulib.patch | 39 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/wget/package.py | 12 |
2 files changed, 42 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/wget/gnulib.patch b/var/spack/repos/builtin/packages/wget/gnulib.patch new file mode 100644 index 0000000000..90537142e3 --- /dev/null +++ b/var/spack/repos/builtin/packages/wget/gnulib.patch @@ -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) diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 511ab1375a..3403fd562f 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -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 |