diff options
| author | Tom Merrick <thomas.merrick@tamucc.edu> | 2018-08-16 10:43:56 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-08-16 08:43:56 -0700 |
| commit | d099eba8c418399643e8980e93e382449719fed1 (patch) | |
| tree | 06fb080a3d38095eaa66eeeeea122e5a9677d3c1 /var | |
| parent | ac6d9298979fd5c22220c9a32710465aa88e35e8 (diff) | |
| download | spack-d099eba8c418399643e8980e93e382449719fed1.tar.gz spack-d099eba8c418399643e8980e93e382449719fed1.tar.bz2 spack-d099eba8c418399643e8980e93e382449719fed1.tar.xz spack-d099eba8c418399643e8980e93e382449719fed1.zip | |
glib: patch for rhel6, centos6, and sl6 (#8947)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/glib/old-kernels.patch | 16 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/glib/package.py | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/glib/old-kernels.patch b/var/spack/repos/builtin/packages/glib/old-kernels.patch new file mode 100644 index 0000000000..4061410320 --- /dev/null +++ b/var/spack/repos/builtin/packages/glib/old-kernels.patch @@ -0,0 +1,16 @@ +--- a/gio/gfile.c 2018-06-11 15:28:30.527667202 -0500 ++++ b/gio/gfile.c 2018-03-12 11:23:37.000000000 -0500 +@@ -3014,11 +3014,11 @@ + + /* Try a 1MiB buffer for improved throughput. If that fails, use the default + * pipe size. See: https://bugzilla.gnome.org/791457 */ +- buffer_size = fcntl (buffer[1], F_SETPIPE_SZ, 1024 * 1024); ++ buffer_size = -1; + if (buffer_size <= 0) + { + int errsv; +- buffer_size = fcntl (buffer[1], F_GETPIPE_SZ); ++ buffer_size = 65536; + errsv = errno; + + if (buffer_size <= 0) diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 87a0286950..76e411aa71 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -72,6 +72,10 @@ class Glib(AutotoolsPackage): # Clang doesn't seem to acknowledge the pragma lines to disable the -Werror # around a legitimate usage. patch('no-Werror=format-security.patch') + # Patch to prevent compiler errors in kernels older than 2.6.35 + patch('old-kernels.patch', when='@2.56: os=rhel6') + patch('old-kernels.patch', when='@2.56: os=centos6') + patch('old-kernels.patch', when='@2.56: os=sl6') def url_for_version(self, version): """Handle glib's version-based custom URLs.""" |