SHA256
1
0
forked from pool/syslinux

Accepting request 358883 from system:install:head

- syslinux-4.04-miniacc.diff: fixup broken conformance tests (forwarded request 358867 from rguenther)

OBS-URL: https://build.opensuse.org/request/show/358883
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/syslinux?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2016-02-17 09:32:21 +00:00 committed by Git OBS Bridge
commit 3a999382dc
3 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,28 @@
Index: lzo/src/miniacc.h
===================================================================
--- lzo/src/miniacc.h.orig 2016-02-11 14:37:17.029802775 +0100
+++ lzo/src/miniacc.h 2016-02-11 14:38:38.086742103 +0100
@@ -4412,12 +4412,12 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mod
#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#else
- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0)
+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0)
#endif
ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0)
#if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#else
- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0)
+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0)
#endif
ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
#if defined(acc_int16e_t)
@@ -4646,7 +4646,7 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mod
#elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#elif !defined(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
#endif
#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
# pragma option pop

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 11 13:43:14 UTC 2016 - rguenther@suse.com
- syslinux-4.04-miniacc.diff: fixup broken conformance tests
-------------------------------------------------------------------
Fri Sep 4 10:35:04 CEST 2015 - snwint@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 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
@ -53,6 +53,7 @@ Patch13: %{name}-%{version}-nostrip.diff
Patch14: %{name}-%{version}-timeout.diff
Patch15: %{name}-%{version}-cache_fix.diff
Patch16: %{name}-%{version}-mtime.diff
Patch17: %{name}-%{version}-miniacc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -85,6 +86,7 @@ Authors:
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17
%build
cp %{SOURCE2} .