diff --git a/nasm-fix-ppc64-build.patch b/nasm-fix-ppc64-build.patch new file mode 100644 index 0000000..560a497 --- /dev/null +++ b/nasm-fix-ppc64-build.patch @@ -0,0 +1,42 @@ +From: Michel Normand +Subject: nasm change unused +Date: Wed, 02 Mar 2016 12:38:37 +0100 + +nasm change _unused to xunused to avoid conflict +when building on PowerPC + +Signed-off-by: Michel Normand +--- + compiler.h | 4 ++-- + output/outmacho.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: nasm-2.12/compiler.h +=================================================================== +--- nasm-2.12.orig/compiler.h ++++ nasm-2.12/compiler.h +@@ -82,9 +82,9 @@ + #endif + + #ifdef __GNUC__ +-# define _unused __attribute__((unused)) ++# define xunused __attribute__((unused)) + #else +-# define _unused ++# define xunused + #endif + + /* Some versions of MSVC have these only with underscores in front */ +Index: nasm-2.12/output/outmacho.c +=================================================================== +--- nasm-2.12.orig/output/outmacho.c ++++ nasm-2.12/output/outmacho.c +@@ -301,7 +301,7 @@ static uint64_t rel_padcnt = 0; + ALIGN(x, fmt.ptrsize) /* align x to output format width */ + + static void debug_reloc (struct reloc *); +-static void debug_section_relocs (struct section *) _unused; ++static void debug_section_relocs (struct section *) xunused; + + static struct section *get_section_by_name(const char *segname, + const char *sectname) diff --git a/nasm.spec b/nasm.spec index 3fd249f..8bd8a57 100644 --- a/nasm.spec +++ b/nasm.spec @@ -1,11 +1,13 @@ Summary: A portable x86 assembler which uses Intel-like syntax Name: nasm Version: 2.12 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://www.nasm.us Source0: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}.tar.bz2 Source1: http://www.nasm.us/pub/nasm/releasebuilds/%{version}/%{name}-%{version}-xdoc.tar.bz2 +# Forwarded upstream: http://bugzilla.nasm.us/show_bug.cgi?id=3392339 +Patch0: %{name}-fix-ppc64-build.patch BuildRequires: perl(Env) BuildRequires: autoconf BuildRequires: asciidoc @@ -39,6 +41,7 @@ include linker, library manager, loader, and information dump. %prep %setup -q +%patch0 -p1 tar xjf %{SOURCE1} --strip-components 1 %build @@ -89,6 +92,9 @@ fi %{_mandir}/man1/ld* %changelog +* Thu Mar 3 2016 Mikolaj Izdebski - 2.12-2 +- Fix build failure on ppc64 + * Mon Feb 29 2016 Mikolaj Izdebski - 2.12-1 - Update to upstream version 2.12