[moarvm/f21] remove more 3rdparty source files
Gerd Pokorra
gerd at fedoraproject.org
Thu Aug 28 09:58:22 UTC 2014
commit e9bf1c6aa2b3816d041e5e4e0780dab49dbe54bf
Author: gerd <gp at zimt.uni-siegen.de>
Date: Thu Aug 28 11:58:18 2014 +0200
remove more 3rdparty source files
moarvm.spec | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/moarvm.spec b/moarvm.spec
index d708336..22629d1 100644
--- a/moarvm.spec
+++ b/moarvm.spec
@@ -4,7 +4,7 @@
Name: moarvm
Version: 0.%{year}.%{month}
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Short for "Metamodel On A Runtime", MoarVM is a virtual machine as a backend for NQP and then Rakudo Perl 6 at the top.
License: Artistic 2.0
@@ -13,7 +13,9 @@ URL: http://moarvm.org
Source0: http://moarvm.org/releases/MoarVM-%{year}.%{month}.tar.gz
BuildRequires: readline-devel libtommath-devel sha-devel libuv-devel
+%if 0%{?fedora} > 20
BuildRequires: libatomic_ops-devel >= 7.4
+%endif
BuildRequires: perl(Pod::Usage)
@@ -54,7 +56,16 @@ This package contains header files for developing applications that use
sed -i -e "/^\$config{cflags}/ s#.*#\$config{cflags} = \"$RPM_OPT_FLAGS -fPIC\";#" Configure.pl
sed -i -e "/^\$config{ldflags}/ s#.*#\$config{ldflags} = \"%{__global_ldflags}\";#" Configure.pl
-rm -r 3rdparty/sha1 3rdparty/linenoise 3rdparty/libatomic_ops 3rdparty/msinttypes
+# make sure to not bundle this
+rm -r 3rdparty/sha1 3rdparty/linenoise 3rdparty/msinttypes
+%if 0%{?fedora} > 20
+rm -r 3rdparty/libatomic_ops
+%endif
+#
+# The upstream libtommath doesn't have the conversion from and to
+# float/double that MoarVM needs. bn_mp_(get|set)_long.c are extentions of the
+# origin libtommath source. The header files are needed to build.
+rm `find 3rdparty/libtommath -type f ! -name '*long.c' -a ! -name '*.h'`
%{__perl} Configure.pl --prefix=%{_usr} --has-libtommath --use-readline \
--has-sha --has-libuv --has-libatomic_ops
@@ -98,6 +109,10 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/libmoar.so
%changelog
+* Fri Aug 29 2014 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.2014.04-5
+- remove of libtommath 3rdparty source files
+- remove of libatomic_ops only if fedora > 20
+
* Fri Aug 22 2014 Gerd Pokorra <gp at zimt.uni-siegen.de> 0.2014.04-4
- add 'BuildRequires: libatomic_ops-devel >= 7.4'
- first remove of 3rdparty source files
More information about the scm-commits
mailing list