From 7e7d7ba802fd77023d8f7dd9072dbeb2e264046dd00e353306fa667d8723ffd1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 20 Feb 2022 11:34:43 +0000 Subject: [PATCH] Accepting request 922946 from home:coolo:branches:openSUSE:Factory - Add multibuild flavor to split the testsuite out of the main package build time. The testsuite dominates the build time and having perl in the bootstrap cycle, we better seperate it. The testsuite flavor rebuilds the same package the same way, but runs the check section OBS-URL: https://build.opensuse.org/request/show/922946 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=208 --- _multibuild | 3 +++ perl.changes | 8 ++++++++ perl.spec | 16 ++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..a0cd1a3 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + testsuite + diff --git a/perl.changes b/perl.changes index d776297..90981f6 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 4 08:08:30 UTC 2021 - Stephan Kulow + +- Add multibuild flavor to split the testsuite out of the main package + build time. The testsuite dominates the build time and having perl + in the bootstrap cycle, we better seperate it. The testsuite flavor + rebuilds the same package the same way, but runs the check section + ------------------------------------------------------------------- Thu Sep 2 15:22:45 UTC 2021 - Dirk Stoecker diff --git a/perl.spec b/perl.spec index 1f3baf1..c159aca 100644 --- a/perl.spec +++ b/perl.spec @@ -1,5 +1,5 @@ # -# spec file for package perl +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,10 +16,15 @@ # +%define flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" != "" +%define name_suffix -%{flavor} +%endif + %define pversion 5.34.0 # set to %nil when equal to pversion %global versionlist %nil -Name: perl +Name: perl%{?name_suffix} Version: 5.34.0 Release: 0 Summary: The Perl interpreter @@ -27,7 +32,7 @@ License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Languages/Perl URL: https://www.perl.org/ Source: https://www.cpan.org/src/5.0/perl-%{version}.tar.xz -Source1: %{name}-rpmlintrc +Source1: perl-rpmlintrc Source2: macros.perl Source3: README.macros Source4: baselibs.conf @@ -225,7 +230,8 @@ mv savelib lib make %{?_smp_mflags} %check -%if !0%{?qemu_user_space_build} +%if "%{name}" == "perl-testsuite" && !0%{?qemu_user_space_build} +%define _unpackaged_files_terminate_build 0 TEST_JOBS="%{jobs}" make %{?_smp_mflags} test %endif @@ -347,6 +353,7 @@ EOF done) } > perl-base-excludes +%if "%{name}" == "perl" %files base -f perl-base-filelist %license Copying Artistic %dir /usr/lib/perl5 @@ -373,5 +380,6 @@ EOF %{_mandir}/man1/* %{_mandir}/man3/* %doc /usr/lib/perl5/*/pod +%endif %changelog