sharkcz pushed to efl (master). "- use luajit only where available"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 8 07:31:48 UTC 2015


>From 523f0cc351195870f68e7a6504917f090fbef141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Wed, 8 Apr 2015 03:30:59 -0400
Subject: - use luajit only where available


diff --git a/efl.spec b/efl.spec
index 1e19a83..9fe64a3 100644
--- a/efl.spec
+++ b/efl.spec
@@ -1,8 +1,12 @@
 %global _hardened_build 1
 
+%ifarch %{arm} %{ix86} x86_64
+%global has_luajit 1
+%endif
+
 Name:		efl
 Version:	1.13.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Collection of Enlightenment libraries
 License:	BSD and LGPLv2+ and GPLv2 and zlib
 URL:		http://enlightenment.org/
@@ -14,7 +18,7 @@ Patch1:		efl-1.13.1-drm-fixes.patch
 # https://phab.enlightenment.org/T2157
 Patch2:		efl-1.13.1-fsf-address-fix.patch
 BuildRequires:	bullet-devel libpng-devel libjpeg-devel gstreamer1-devel zlib-devel
-BuildRequires:	gstreamer1-plugins-base-devel luajit-devel libtiff-devel openssl-devel
+BuildRequires:	gstreamer1-plugins-base-devel libtiff-devel openssl-devel
 BuildRequires:	curl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel
 BuildRequires:	fribidi-devel pulseaudio-libs-devel libsndfile-devel libX11-devel
 BuildRequires:	libXau-devel libXcomposite-devel libXdamage-devel libXdmcp-devel
@@ -27,6 +31,11 @@ BuildRequires:	doxygen, systemd, libwayland-client-devel giflib-devel
 BuildRequires:	mesa-libwayland-egl-devel, openjpeg-devel, libdrm-devel
 BuildRequires:	autoconf, automake, libtool, gettext-devel, mesa-libGLES-devel
 BuildRequires:	mesa-libgbm-devel, libinput-devel
+%if 0%{?has_luajit}
+BuildRequires:	luajit-devel
+%else
+BuildRequires:	lua-devel
+%endif
 # These are convenience provides to aid in migration
 Provides:	e_dbus%{?_isa} = %{version}-%{release}
 Provides:	e_dbus = %{version}-%{release}
@@ -157,6 +166,9 @@ autoreconf -ifv
 %ifarch %{arm}
 	--disable-neon \
 %endif
+%if ! 0%{?has_luajit}
+	--enable-lua-old \
+%endif
 	--with-systemdunitdir=%{_unitdir}
 make %{?_smp_mflags} V=1
 # This makes doxygen segfault. :/
@@ -243,9 +255,13 @@ fi
 # elocation
 %{_libdir}/libelocation.so.1*
 # elua
+%if 0%{?has_luajit}
 %{_bindir}/elua
 %{_datadir}/elua/
 %{_libdir}/libelua.so.1*
+%else
+%exclude %{_datadir}/elua/
+%endif
 # embryo
 %{_bindir}/embryo_cc
 %{_libdir}/libembryo.so.1*
@@ -358,10 +374,14 @@ fi
 %{_libdir}/libelocation.so
 %{_libdir}/pkgconfig/elocation.pc
 # elua-devel
+%if 0%{?has_luajit}
 %{_includedir}/elua-1/
 %{_libdir}/libelua.so
 %{_libdir}/pkgconfig/elua.pc
 %{_libdir}/cmake/Elua/
+%else
+%exclude %{_libdir}/cmake/Elua/
+%endif
 # embryo-devel
 %{_includedir}/embryo-1/
 %{_libdir}/libembryo.so
@@ -414,6 +434,9 @@ fi
 %{_libdir}/pkgconfig/evas*.pc
 
 %changelog
+* Wed Apr  8 2015 Dan HorĂ¡k <dan[at]danny.cz> - 1.13.2-2
+- use luajit only where available
+
 * Mon Apr  6 2015 Tom Callaway <spot at fedoraproject.org> - 1.13.2-1
 - update to 1.13.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/efl.git/commit/?h=master&id=523f0cc351195870f68e7a6504917f090fbef141


More information about the scm-commits mailing list