rpm/lua-toluapp
SHA256
1
0
Fork 0
forked from pool/lua-toluapp
Code Pull Requests Activity

Accepting request 679086 from home:MargueriteSu:branches:devel:languages:lua

Browse Source 
- fix tumbleweed build
- add scons-0.98.1-Options-deprecated.patch
  * Options object has been deprecated since scons 0.98.1
    use newer Variables object if available

OBS-URL: https://build.opensuse.org/request/show/679086
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-toluapp?expand=0&rev=19
This commit is contained in:
Marguerite Su 2019-02-26 04:04:30 +00:00 committed by Git OBS Bridge
parent cdfd5f89c8
commit 90be1cc7a1
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua-toluapp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 26 03:51:05 UTC 2019 - Marguerite Su <i@marguerite.su>
- fix tumbleweed build
- add scons-0.98.1-Options-deprecated.patch
* Options object has been deprecated since scons 0.98.1
use newer Variables object if available
-------------------------------------------------------------------
Thu Jan 25 20:16:23 UTC 2018 - tchvatal@suse.com

7
lua-toluapp.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lua-toluapp
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -41,6 +41,8 @@ Patch1: toluapp-versioned-shared-lib.patch
Patch2: toluapp-build-compare.patch
Patch3: tolua++-1.0.93-lua52.patch
Patch4: toluapp-scons-py3.patch
#PATCH-FIX-UPSTREAM marguerite@opensuse.org - scons Options() is deprecated in 0.98.1, use Variables() instead
Patch5: scons-0.98.1-Options-deprecated.patch
BuildRequires: %{flavor}-devel
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@ -95,6 +97,7 @@ This package provides development headers for tolua++.
%patch1 -p1
%patch2 -p1
%patch4 -p1
%patch5 -p1
%if "%{flavor}" != "lua51"
%patch3 -p1
%endif

17
scons-0.98.1-Options-deprecated.patch Normal file
View File

@ -0,0 +1,17 @@
Index: toluapp-1.0.93/SConstruct
===================================================================
--- toluapp-1.0.93.orig/SConstruct
+++ toluapp-1.0.93/SConstruct
@@ -16,7 +16,11 @@ elif 'msvc' in env['TOOLS']:
else:
options_file = "posix"
-opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS)
+try:
+ opts = Variables(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS)
+except NameError:
+ opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS)
+
opts.Add('CC', 'The C compiler.')
opts.Add('CXX', 'The C++ compiler (for the tests)')
opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])