From 0895cef740b9f3d14de6a993bca9447e1729aa0a Mon Sep 17 00:00:00 2001 From: zhouwenpei Date: Wed, 30 Mar 2022 11:35:12 +0800 Subject: [PATCH] add build conditions to control installing systemtap --- perl.spec | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/perl.spec b/perl.spec index 4ff9d07..719664f 100644 --- a/perl.spec +++ b/perl.spec @@ -18,11 +18,13 @@ %global perl_compat perl(:MODULE_COMPAT_5.34.0) +%bcond_without systemtap + Name: perl License: (GPL+ or Artistic) and (GPLv2+ or Artistic) and MIT and UCD and Public Domain and BSD Epoch: 4 Version: %{perl_version} -Release: 4 +Release: 5 Summary: A highly capable, feature-rich programming language Url: https://www.perl.org/ Source0: https://www.cpan.org/src/5.0/%{name}-%{version}.tar.xz @@ -37,7 +39,10 @@ Patch6: perl-5.35.1-Raise-version-number-in-ext-GDBM_File-GDBM_File.pm.patch Patch6000: backport-CVE-2021-36770.patch BuildRequires: gcc bash findutils coreutils make tar procps bzip2-devel gdbm-devel perl-File-Compare perl-File-Find -BuildRequires: zlib-devel systemtap-sdt-devel perl-interpreter perl-generators +BuildRequires: zlib-devel perl-interpreter perl-generators +%if %{with systemtap} +BuildRequires: systemtap-sdt-devel +%endif Requires: perl-libs = %{epoch}:%{version}-%{release} Requires: perl-version perl-threads perl-threads-shared perl-parent @@ -91,7 +96,10 @@ This package is the shared library for perl. Summary: Development files for %{name} License: (GPL+ or Artistic) and UCD -Requires: perl = %{epoch}:%{version}-%{release} system-rpm-config systemtap-sdt-devel +Requires: perl = %{epoch}:%{version}-%{release} system-rpm-config +%if %{with systemtap} +Requires: systemtap-sdt-devel +%endif Requires: perl(ExtUtils::ParseXS) perl(Devel::PPPort) Requires: %perl_compat @@ -132,7 +140,10 @@ sed -i '/\(bzip2\|zlib\)-src/d' MANIFEST -Dvendorarch="%{perl_vendor_libdir}" -Darchname="%{_arch}-%{_os}-thread-multi" \ -Dlibpth="/usr/local/lib64 /lib64 %{_prefix}/lib64" \ -Duseshrplib -Dusethreads -Duseithreads -Ui_ndbm -Di_gdbm \ - -Dusedtrace='/usr/bin/dtrace' -Ubincompat5005 -Dusesitecustomize \ +%if %{with systemtap} + -Dusedtrace='/usr/bin/dtrace' \ +%endif + -Ubincompat5005 -Dusesitecustomize \ -Duselargefiles -Dd_semctl_semun -Di_db -Duse64bitint \ -Di_shadow -Di_syslog -Dman3ext=3pm -Duseperlio -Dscriptdir='%{_bindir}' \ -Dinstallusrbinperl=n -Uversiononly -Dpager='/usr/bin/less -isr' \ @@ -487,6 +498,12 @@ make test_harness %{_mandir}/man3/* %changelog +* Wed Mar 30 2022 zhouwenpei 4:5.34.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add build conditions to control installing systemtap + * Mon Mar 28 2022 tianwei 4:5.34.0-4 - Type:bugfix - ID:NA -- Gitee