[tolua++] Unified linking, add missing changelog entry

Tim Niemueller timn at fedoraproject.org
Mon Dec 15 17:51:38 UTC 2014


commit 9f65d6d680d9da65318d7348c8dbde5b7a93419f
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Mon Dec 15 18:47:56 2014 +0100

    Unified linking, add missing changelog entry
    
    We no longer need to link differently on non-x86-64 platforms as we do
    not embed code anymore, but rather install it along the package and just
    load and call it. That makes it easier to modify and fix it and seems to
    solve the problem for me. But I do not have a non-x86-64 platform at
    hand right now, someone who has please confirm.
    
    Add missing changelog entry along the way.

 tolua++.spec |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/tolua++.spec b/tolua++.spec
index f6d14d4..c48e0ba 100644
--- a/tolua++.spec
+++ b/tolua++.spec
@@ -40,19 +40,7 @@ sed -i 's/\r//' doc/%{name}.html
 
 %build
 scons %{?_smp_mflags} -Q CCFLAGS="%{optflags} $(pkg-config --cflags lua)" 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_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 x86_64
 gcc -o bin/%{name} src/bin/tolua.o -Llib -l%{solib} -llua -ldl -lm
-%else
-gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind_default.o -Llib -l%{solib} -llua -ldl -lm
-%endif
 
 
 %install
@@ -85,6 +73,9 @@ install -p -m 644 src/bin/lua/*.lua $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %changelog
+* Mon Dec 15 2014 Tim Niemueller <tim at niemueller.de> - 1.0.93-14
+- Compatibility with Lua 5.2
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.93-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list