[packages/icedtea8] add systemtap bcond

atler atler at pld-linux.org
Wed May 6 11:50:22 CEST 2020


commit 0874980a2a68d90dc372aca823db3eb59a95d31c
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed May 6 11:49:18 2020 +0200

    add systemtap bcond

 icedtea8.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/icedtea8.spec b/icedtea8.spec
index 0d882e1..1b6c50e 100644
--- a/icedtea8.spec
+++ b/icedtea8.spec
@@ -12,10 +12,11 @@
 # - maybe build Shark VM, at least on i486, as the zero-assembly VM is very slow
 # - pass %{rpmcflags} to build
 
-%bcond_with bootstrap   # build a bootstrap version, using icedtea6
-%bcond_without nss	# don't use NSS
-%bcond_without cacerts	# don't include the default CA certificates
-%bcond_without sunec	# enable Sun EC crypt lib
+%bcond_with	bootstrap	# build a bootstrap version, using icedtea6
+%bcond_without	nss		# don't use NSS
+%bcond_without	cacerts		# don't include the default CA certificates
+%bcond_without	sunec		# enable Sun EC crypt lib
+%bcond_without	systemtap	# build without systemtap
 
 %if %{with bootstrap}
 %define		use_jdk	openjdk8
@@ -93,7 +94,7 @@ BuildRequires:	lsb-release
 BuildRequires:	paxctl
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.557
-BuildRequires:	systemtap-sdt-devel >= 3.2
+%{?with_systemtap:BuildRequires:	systemtap-sdt-devel >= 3.2}
 BuildRequires:	unzip
 BuildRequires:	util-linux
 BuildRequires:	xorg-lib-libX11-devel
@@ -762,7 +763,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dstdir}/lib/%{jre_arch}
 %dir %{dstdir}/lib/%{jre_arch}/jli
 %attr(755,root,root) %{dstdir}/lib/%{jre_arch}/jli/*.so
-%{dstdir}/tapset
+%{?with_systemtap:%{dstdir}/tapset}
 
 %files jre
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea8.git/commitdiff/0874980a2a68d90dc372aca823db3eb59a95d31c



More information about the pld-cvs-commit mailing list