From 00b0449986b8a48fc058f7edea80f6c91d9b06ac Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Dec 15 2015 18:58:10 +0000 Subject: fix build for rawhide gcc, i hope --- diff --git a/gambas3-gcc-fix.patch b/gambas3-gcc-fix.patch new file mode 100644 index 0000000..a7418ed --- /dev/null +++ b/gambas3-gcc-fix.patch @@ -0,0 +1,11 @@ +--- gambas3-3.8.4/main/share/gambas.h.fix 2015-12-15 13:24:50.959501153 -0500 ++++ gambas3-3.8.4/main/share/gambas.h 2015-12-15 13:25:07.023387570 -0500 +@@ -66,7 +66,7 @@ + #endif + + #if defined(__cplusplus) && !defined(__clang__) +- #define __null ((intptr_t)0) ++/* #define __null ((intptr_t)0) */ + #else + #ifdef bool + #undef bool diff --git a/gambas3.spec b/gambas3.spec index 15e5335..c3255e1 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -49,6 +49,7 @@ Patch1: %{name}-3.2.0-nolintl.patch Patch2: %{name}-3.2.0-noliconv.patch # Don't conflict with siginfo_t define Patch5: gambas3-3.1.1-linux-siginfo.patch +Patch6: gambas3-gcc-fix.patch %description Gambas3 is a free development environment based on a Basic interpreter @@ -915,6 +916,7 @@ Requires: %{name}-gb-xml = %{version}-%{release} %patch1 -p1 -b .nolintl %patch2 -p1 -b .noliconv # %%patch5 -p1 -b .linux-siginfo +%patch6 -p1 -b .gccfix # We used to patch these out, but this is simpler. for i in `find . |grep acinclude.m4`; do sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i