From c8185e4ee9fea6abe08b25af8fd5fc18cb404336aa81d5af99f6d7e9ee6990a2 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 11 Feb 2016 15:29:33 +0000 Subject: [PATCH] Accepting request 358867 from home:rguenther:branches:system:install:head - syslinux-4.04-miniacc.diff: fixup broken conformance tests OBS-URL: https://build.opensuse.org/request/show/358867 OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=76 --- syslinux-4.04-miniacc.diff | 28 ++++++++++++++++++++++++++++ syslinux.changes | 5 +++++ syslinux.spec | 4 +++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 syslinux-4.04-miniacc.diff diff --git a/syslinux-4.04-miniacc.diff b/syslinux-4.04-miniacc.diff new file mode 100644 index 0000000..97e0162 --- /dev/null +++ b/syslinux-4.04-miniacc.diff @@ -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 diff --git a/syslinux.changes b/syslinux.changes index 5d5721c..0302ad4 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -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 diff --git a/syslinux.spec b/syslinux.spec index e4cb17f..40e2625 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -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} .