From feefab986005490169b33c3e3c5a2376162af5c9f3cb20f9a5baa1dae2d20675 Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Wed, 15 Nov 2017 12:32:21 +0000 Subject: [PATCH] Accepting request 541990 from home:Andreas_Schwab:Factory - Support --without=testsuite and disable testsuite for qemu-linux-user builds OBS-URL: https://build.opensuse.org/request/show/541990 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=175 --- gdb.changes | 6 ++++++ gdb.spec | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gdb.changes b/gdb.changes index b9aedee..8396e56 100644 --- a/gdb.changes +++ b/gdb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 15 08:54:04 UTC 2017 - schwab@suse.de + +- Support --without=testsuite and disable testsuite for qemu-linux-user + builds + ------------------------------------------------------------------- Wed Oct 25 12:14:54 UTC 2017 - jmatejek@suse.com diff --git a/gdb.spec b/gdb.spec index 0e0e91d..84574d8 100644 --- a/gdb.spec +++ b/gdb.spec @@ -17,7 +17,10 @@ # -%define _with_testsuite 1 +%if 0%{?qemu_user_space_build} +%global _without_testsuite 1 +%endif +%bcond_without testsuite Summary: A GNU source-level debugger for C, C++, Fortran and other languages License: GPL-3.0+ and GPL-3.0-with-GCC-exception and LGPL-2.1+ and LGPL-3.0+ @@ -328,7 +331,7 @@ BuildRequires: cmake ExclusiveArch: noarch i386 x86_64 ppc ppc64 ia64 s390 s390x %endif # 0%{?el5:1} -%if 0%{?_with_testsuite:1} +%if %{with testsuite} # Ensure the devel libraries are installed for both multilib arches. %global bits_local %{?_isa} @@ -384,7 +387,7 @@ BuildRequires: glibc-devel-static-32bit BuildRequires: glibc-devel-static %endif -%endif # 0%{?_with_testsuite:1} +%endif # %{with testsuite} %ifarch ia64 BuildRequires: libunwind-devel @@ -868,7 +871,7 @@ cp $RPM_BUILD_DIR/%{gdb_src}/gdb/NEWS $RPM_BUILD_DIR/%{gdb_src} # Initially we're in the %{gdb_src} directory. cd %{gdb_build} -%if 0%{!?_with_testsuite:1} +%if %{without testsuite} echo ====================TESTSUITE DISABLED========================= %else echo ====================TESTING========================= @@ -1133,7 +1136,7 @@ fi %endif %endif -%if 0%{?_with_testsuite:1} +%if %{with testsuite} %files testresults %defattr(-,root,root) %doc %{gdb_build}/gdb/gdb-*.sum