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

glib: patch for rhel6, centos6, and sl6 (#8947)

Browse Source
This commit is contained in:
Tom Merrick 2018-08-16 10:43:56 -05:00 committed by Todd Gamblin
parent ac6d929897
commit d099eba8c4
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/glib/old-kernels.patch Normal file
View File

@ -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)

4
var/spack/repos/builtin/packages/glib/package.py
View File

@ -72,6 +72,10 @@ class Glib(AutotoolsPackage):
# Clang doesn't seem to acknowledge the pragma lines to disable the -Werror # Clang doesn't seem to acknowledge the pragma lines to disable the -Werror
# around a legitimate usage. # around a legitimate usage.
patch('no-Werror=format-security.patch') 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): def url_for_version(self, version):
"""Handle glib's version-based custom URLs.""" """Handle glib's version-based custom URLs."""