From facd88f0348ac0469c9dfa3faa7da159486803114432fa68a414c1c1fd34da86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 13 Nov 2016 20:48:06 +0000 Subject: [PATCH] Accepting request 440128 from home:oertel:branches:Mono:Factory - add boehm define in specfile to exclude boehm parts on aarch64 - enable buildrequires for valgrind on aarch64 OBS-URL: https://build.opensuse.org/request/show/440128 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=178 --- mono-core.changes | 6 ++++++ mono-core.spec | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/mono-core.changes b/mono-core.changes index 50b1632..03f49d1 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 12 14:36:43 CET 2016 - ro@suse.de + +- add boehm define in specfile to exclude boehm parts on aarch64 +- enable buildrequires for valgrind on aarch64 + ------------------------------------------------------------------- Sun Oct 16 08:46:34 UTC 2016 - mailaender@opensuse.org diff --git a/mono-core.spec b/mono-core.spec index aee91a7..422ae91 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -19,6 +19,11 @@ %{!?ext_man: %define ext_man .gz} %define llvm no %define sgen yes +%ifarch aarch64 +%define boehm no +%else +%define boehm yes +%endif Name: mono-core Version: 4.6.1 @@ -51,7 +56,7 @@ BuildRequires: pkgconfig(libgdiplus) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(zlib) -%ifnarch ia64 %arm aarch64 s390 +%ifnarch ia64 %arm s390 BuildRequires: pkgconfig(valgrind) %endif %if %llvm == yes @@ -296,7 +301,9 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py %{_bindir}/ikdasm %{_bindir}/mcs %{_bindir}/mono +%if %boehm == yes %{_bindir}/mono-boehm +%endif %{_bindir}/mono-configuration-crypto %if %sgen == yes %{_bindir}/mono-sgen @@ -492,6 +499,7 @@ Development files for libmono. %{_libdir}/libmono-2.0.so %{_libdir}/pkgconfig/mono-2.pc +%if %boehm == yes %package -n libmonoboehm-2_0-1 Summary: A Library for embedding Mono in your Application (Boehm GC) License: LGPL-2.1 @@ -535,6 +543,7 @@ Development files for libmonoboehm %files -n libmonoboehm-2_0-devel %defattr(-, root, root) %{_libdir}/libmonoboehm-2.0.so +%endif %if %sgen == yes %package -n libmonosgen-2_0-1 @@ -1182,7 +1191,9 @@ Mono development tools. %{_bindir}/monop2 %{_bindir}/mprof-report %{_bindir}/pdb2mdb +%if %boehm == yes %{_bindir}/pedump +%endif %{_bindir}/permview %{_bindir}/prj2make %{_bindir}/resgen @@ -1408,8 +1419,10 @@ Requires: libmono-llvm0 = %{version} Requires: libmonosgen-2_0-1 = %{version} Requires: libmonosgen-2_0-devel = %{version} %endif +%if %boehm == yes Requires: libmonoboehm-2_0-1 = %{version} Requires: libmonoboehm-2_0-devel = %{version} +%endif Requires: mono-data = %{version} Requires: mono-data-oracle = %{version} Requires: mono-data-sqlite = %{version}