Compare commits

...

2 Commits

Author SHA1 Message Date
David Abdurachmanov 3008d6f019
Allow Lua 5.4
Fedora 33 has Lua 5.4.1

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
2020-12-04 16:31:38 +02:00
David Abdurachmanov 8e007b21f9
Add support for riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
2020-12-04 15:57:27 +02:00
2 changed files with 26 additions and 2 deletions

13
allow-lua-54.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/meson.build b/meson.build
index 91ddfdc..a9d5262 100644
--- a/meson.build
+++ b/meson.build
@@ -256,7 +256,7 @@ ecore_evas_wayland_engine_include_dir = []
evas_static_list = []
luaold_interpreters = [
- ['lua', ['>=5.1.0', '<5.3.0']],
+ ['lua', ['>=5.1.0', '<5.5.0']],
['lua51', ['>=5.1.0', '<5.2.0']],
['lua-5.1', ['>=5.1.0', '<5.2.0']],
['lua5.1', ['>=5.1.0', '<5.2.0']],

View File

@ -10,6 +10,10 @@
# %%global has_luajit 0
# %%endif
%ifarch riscv64
%global has_luajit 0
%endif
# Look, you probably don't want this. scim is so 2012. ibus is the new hotness.
# Enabling this means you'll almost certainly need to pass ECORE_IMF_MODULE=xim
# to get anything to work. (*cough*terminology*cough*)
@ -26,7 +30,7 @@
Name: efl
Version: 1.25.1
Release: 2%{?dist}
Release: 2.0.riscv64%{?dist}
Summary: Collection of Enlightenment libraries
License: BSD and LGPLv2+ and GPLv2 and zlib
URL: http://enlightenment.org/
@ -42,7 +46,9 @@ Patch3: efl-1.25.0-no-neon.patch
# Upstream efl probably needs to rework how they use check in their C tests
Patch4: efl-1.25.0-check-fix.patch
%ifnarch s390 s390x
Patch10: allow-lua-54.patch
%ifnarch s390 s390x riscv64
BuildRequires: libunwind-devel
%endif
BuildRequires: gcc-c++
@ -202,6 +208,8 @@ Development files for EFL.
%patch3 -p1 -b .noneon
%patch4 -p1 -b .checkfix
%patch10 -p1 -b .lua54
# This is why hardcoding paths is bad.
# sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
# data/libeo.so.%{version}-gdb.py
@ -566,6 +574,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libexactness*.so
%changelog
* Fri Dec 04 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 1.25.1-2.0.riscv64
- Add support for riscv64
* Fri Oct 23 10:33:37 CEST 2020 Nils Philippsen <nils@tiptoe.de> - 1.25.1-2
- rebuild for new libavif