pool/libhugetlbfs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 313325 from home:1Antoine1:branches:Base:System

Browse Source 
- Add libhugelbfs-2.18-restrict-is-a-reserved-word.patch which
  fixes compilation with GCC 5 (and C99/C11 in general).

OBS-URL: https://build.opensuse.org/request/show/313325
OBS-URL: https://build.opensuse.org/package/show/Base:System/libhugetlbfs?expand=0&rev=41
This commit is contained in:
Thomas Renninger 2015-06-24 09:27:42 +00:00 committed by Git OBS Bridge
parent e64860762b
commit 16c537a6e3
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libhugetlbfs-2.18-restrict-is-a-reserved-word.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up libhugetlbfs-2.18/hugeutils.c.orig libhugetlbfs-2.18/hugeutils.c
--- libhugetlbfs-2.18/hugeutils.c.orig 2015-06-24 00:23:09.374535669 +0200
+++ libhugetlbfs-2.18/hugeutils.c 2015-06-24 00:23:45.536534148 +0200
@@ -301,14 +301,14 @@ void hugetlbfs_setup_env()
env = getenv("HUGETLB_RESTRICT_EXE");
if (env) {
- char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE];
+ char *p, *tok, *exe, buf[MAX_EXE+1], restriction[MAX_EXE];
int found = 0;
exe = get_exe_name(buf, sizeof buf);
DEBUG("Found HUGETLB_RESTRICT_EXE, this exe is \"%s\"\n", exe);
- strncpy(restrict, env, sizeof restrict);
- restrict[sizeof(restrict)-1] = 0;
- for (p = restrict; (tok = strtok(p, ":")) != NULL; p = NULL) {
+ strncpy(restriction, env, sizeof restriction);
+ restriction[sizeof(restriction)-1] = 0;
+ for (p = restriction; (tok = strtok(p, ":")) != NULL; p = NULL) {
DEBUG(" ...check exe match for \"%s\"\n", tok);
if (strcmp(tok, exe) == 0) {
found = 1;

6
libhugetlbfs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 23 22:35:32 UTC 2015 - antoine.belvire@laposte.net
- Add libhugelbfs-2.18-restrict-is-a-reserved-word.patch which
fixes compilation with GCC 5 (and C99/C11 in general).
-------------------------------------------------------------------
Fri Feb 20 12:11:44 UTC 2015 - normand@linux.vnet.ibm.com

5
libhugetlbfs.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libhugetlbfs
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -45,6 +45,8 @@ Patch8: libhugetlbfs_fix_tests.patch
Patch13: ignore-perl-modules.diff
Patch14: disable-rw-on-non-ldscripts.diff
Patch15: fix_plt_extrasz_always_returning_0_on_ppc64le.patch
# PATCH-FIX-UPSTREAM libhugetlbfs-2.18-restrict-is-a-reserved-word.patch -- Fix compilation with GCC 5 (and C99/C11 in general)
Patch16: libhugetlbfs-2.18-restrict-is-a-reserved-word.patch
%description
The libhugetlbfs package interacts with the Linux hugetlbfs to
@ -67,6 +69,7 @@ Devel package, header and static library, of libhugetlb
%patch13
%patch14
%patch15 -p1
%patch16 -p1
%build
make %{my_make_flags}