[tolua++] Use the pre-generated toluabind.c everywhere but x86_64, something goes wrong

[Hans de Goede]

commit 7f0cc30c8545c5fe61f96e9da30a1fd42e53fa7e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Jun 16 17:33:48 2014 +0200

    Use the pre-generated toluabind.c everywhere but x86_64, something goes wrong
    
      when re-generating it (bootstrap) elsewhere (rhbz#1094103)

 tolua++.spec |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/tolua++.spec b/tolua++.spec
index 999b60e..8537742 100644
--- a/tolua++.spec
+++ b/tolua++.spec
@@ -2,7 +2,7 @@
 
 Name:           tolua++
 Version:        1.0.93
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A tool to integrate C/C++ code with Lua
 Group:          Development/Tools
 License:        MIT
@@ -40,21 +40,17 @@ sed -i 's/\r//' doc/%{name}.html
 scons %{?_smp_mflags} -Q CCFLAGS="%{optflags} $(pkg-config --cflags lua-5.1)" tolua_lib=%{solib} LINKFLAGS="-Wl,-soname,lib%{solib}.so" shared=1
 # Relink the tolua++ binary, there are 2 reasons for this:
 # -Link it without the soname which we add to LINKFLAGS to build a shared lib
-# -On non x86 link it against the pre-generated toluabind rather then the
-#  bootstapped one as something goes wrong with the bootstrap on both ARM
-#  and ppc (rhbz#704372) causing a segfault for unknown reasons.
+# -On non x86_64 link it against the pre-generated toluabind rather then the
+#  bootstapped one as something goes wrong with the bootstrap on ARM, x86_32
+#  (rhbz#1094103) and ppc (rhbz#704372) causing a segfault for unknown reasons.
 #  It would be better to switch to using lua code directly, rather then
 #  using built-in lua byte-code, since the byte-code is somewhat platfrom
 #  dependent, see Patch2 for an attempt at this
-%ifarch %{ix86}
-gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind.o -Llib -l%{solib} -llua-5.1 -ldl -lm
-%else
 %ifarch x86_64
 gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind.o -Llib -l%{solib} -llua-5.1 -ldl -lm
 %else
 gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind_default.o -Llib -l%{solib} -llua-5.1 -ldl -lm
 %endif
-%endif
 
 
 %install
@@ -86,6 +82,10 @@ install -p -m 644 include/%{name}.h $RPM_BUILD_ROOT%{_includedir}
 
 
 %changelog
+* Mon Jun 16 2014 Hans de Goede <hdegoede at redhat.com> - 1.0.93-12
+- Use the pre-generated toluabind.c everywhere but x86_64, something goes wrong
+  when re-generating it (bootstrap) elsewhere (rhbz#1094103)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.93-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild