Merge remote-tracking branch 'up/f31' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Update glib-2.60.0-disable-tests.patch to incl. gio/tests
2019-09-21 16:36:41 +03:00 · 2019-03-23 17:50:57 +01:00 · 2019-03-23 17:23:38 +01:00 · 2019-03-23 16:44:12 +01:00
2 changed files with 37 additions and 3 deletions
--- a/glib-2.60.0-disable-tests.patch
+++ b/glib-2.60.0-disable-tests.patch
@ -0,0 +1,21 @@
+diff --git a/gio/meson.build b/gio/meson.build
+index 88575ec..de01ab5 100644
+--- a/gio/meson.build
+++ b/gio/meson.build
+@@ -993,4 +993,3 @@ if enable_systemtap
+ endif
+ 
+ subdir('fam')
+-subdir('tests')
+diff --git a/meson.build b/meson.build
+index af0103c..4e2829d 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1987,7 +1987,6 @@ subdir('gthread')
+ subdir('gmodule')
+ subdir('gio')
+ subdir('fuzzing')
+-subdir('tests')
+ 
+ # xgettext is optional (on Windows for instance)
+ if find_program('xgettext', required : get_option('nls')).found()
--- a/glib2.spec
+++ b/glib2.spec
@ -2,13 +2,15 @@

 Name: glib2
 Version: 2.62.0
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 Summary: A library of handy utility functions

 License: LGPLv2+
 URL: http://www.gtk.org
 Source0: http://download.gnome.org/sources/glib/2.62/glib-%{version}.tar.xz

+Patch0: glib-2.60.0-disable-tests.patch
+
 BuildRequires: chrpath
 BuildRequires: gcc
 BuildRequires: gcc-c++
@ -72,6 +74,7 @@ Requires: %{name}-devel = %{version}-%{release}
 %description static
 The %{name}-static subpackage contains static libraries for %{name}.

+%ifnarch riscv64
 %package tests
 Summary: Tests for the glib2 package
 Requires: %{name}%{?_isa} = %{version}-%{release}
@ -79,6 +82,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description tests
 The glib2-tests package contains tests that can be used to verify
 the functionality of the installed glib2 package.
+%endif

 %prep
 %autosetup -n glib-%{version} -p1
@ -92,8 +96,12 @@ rm glib/pcre/*.[ch]
    -Ddtrace=true \
    -Dsystemtap=true \
    -Dgtk_doc=true \
-    -Dfam=true \
-    -Dinstalled_tests=true
+%ifnarch riscv64
+    -Dinstalled_tests=true \
+%else
+    -Dinstalled_tests=false \
+%endif
+    -Dfam=true

 %meson_build

@ -211,11 +219,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/libgobject-2.0.a
 %{_libdir}/libgthread-2.0.a

+%ifnarch riscv64
 %files tests
 %{_libexecdir}/installed-tests
 %{_datadir}/installed-tests
+%endif

 %changelog
+* Sat Mar 23 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 2.60.0-3.0.riscv64
+- Disable tests subpackage on RISC-V (riscv64)
+
 * Fri Sep 06 2019 Kalev Lember <klember@redhat.com> - 2.62.0-1
 - Update to 2.62.0
Author	SHA1	Message	Date
David Abdurachmanov	fb21f54471	Merge remote-tracking branch 'up/f31' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>	2019-09-21 16:36:41 +03:00
David Abdurachmanov	99a5043b3d	Update glib-2.60.0-disable-tests.patch to incl. gio/tests Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2019-03-23 17:50:57 +01:00
David Abdurachmanov	8f557b41ec	Patch meson.build to skip tests subdir Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2019-03-23 17:23:38 +01:00
David Abdurachmanov	afb7efb95c	Disable tests subpackage on RISC-V (riscv64) Hopefully we can avoid: FAILED: gio/tests/resources [..] /usr/bin/ld: gio/tests/test_resources2.o: can't link soft-float modules with double-float modules /usr/bin/ld: failed to merge target specific data of file gio/tests/test_resources2.o collect2: error: ld returned 1 exit status Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2019-03-23 16:44:12 +01:00