From 80e7a9cd20b3d7404b6b76f301f02e5821eef1ce Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 7 Aug 2015 18:35:24 +0200 Subject: [PATCH] Exomizer: forgot to add patches. --- .../exomizer/patches/exomizer-2.0.7.patchset | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 app-arch/exomizer/patches/exomizer-2.0.7.patchset diff --git a/app-arch/exomizer/patches/exomizer-2.0.7.patchset b/app-arch/exomizer/patches/exomizer-2.0.7.patchset new file mode 100644 index 000000000..70293e14c --- /dev/null +++ b/app-arch/exomizer/patches/exomizer-2.0.7.patchset @@ -0,0 +1,50 @@ +From 85cd06b9f153fa8b77e82d20cd561f0ac9bbba4c Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 25 Jul 2015 09:14:21 +0200 +Subject: gcc2 fix. + + +diff --git a/Makefile b/Makefile +index 92fd825..2cc78d1 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + # Makefile for exomizer + # + WFLAGS = -Wall -Wstrict-prototypes +-CFLAGS = $(WFLAGS) -O3 -ffast-math -mtune=i686 -fomit-frame-pointer -fgcse -pedantic ++CFLAGS = $(WFLAGS) -O3 -ffast-math -march=i686 -fomit-frame-pointer -fgcse -pedantic + LDFLAGS = -s + + #CFLAGS = -g -mtune=i686 $(WFLAGS) +-- +2.2.2 + + +From ca5c2fc883d1ea4e3ffc7443ffbb8264fd553f82 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 25 Jul 2015 09:44:28 +0200 +Subject: Fix build with recent Bison versions + +* This file uses ECHO as a token, which Bison used to generate as a #define. +* New versions of Bison will put the tokens in an enum instead. +* Lex defines an ECHO macro, and code in asm.yy ends up using that +instead of the enum value. +* The lex macro is guarded by an ifndef, so just define the macro to +skip the lex replacement. + +diff --git a/asm.yy b/asm.yy +index 6220623..69f106f 100644 +--- a/asm.yy ++++ b/asm.yy +@@ -34,6 +34,7 @@ + #include "parse.h" + #include "asm.tab.h" + ++#define ECHO ECHO + #define MAX_SRC_BUFFER_DEPTH 10 + static YY_BUFFER_STATE src_buffers[MAX_SRC_BUFFER_DEPTH]; + static int src_buffer_depth = 0; +-- +2.2.2 +