rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use %{with_systemtap} instead of %{jit_arches}

Browse Source
This commit is contained in:
Omair Majid 2013-08-29 22:11:50 -04:00
parent 7df9b6632c
commit dd1af83bd9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java-1.8.0-openjdk.spec
View File

@ -125,7 +125,7 @@
%global jvmjardir %{_jvmjardir}/%{name}-%{version} %global jvmjardir %{_jvmjardir}/%{name}-%{version}
%endif %endif
%ifarch %{jit_arches} %ifarch %{with_systemtap}
# Where to install systemtap tapset (links) # Where to install systemtap tapset (links)
# We would like these to be in a package specific subdir, # We would like these to be in a package specific subdir,
# but currently systemtap doesn't support that, so we have to # but currently systemtap doesn't support that, so we have to
@ -252,8 +252,7 @@ BuildRequires: openssl
%ifnarch %{arm} %{aarch64} %ifnarch %{arm} %{aarch64}
BuildRequires: prelink BuildRequires: prelink
%endif %endif
%ifarch %{jit_arches} %ifarch %{with_systemtap}
#systemtap build requirement.
BuildRequires: systemtap-sdt-devel BuildRequires: systemtap-sdt-devel
%endif %endif
@ -503,7 +502,7 @@ pushd %{buildoutputdir}/images/j2sdk-image
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
%ifarch %{jit_arches} %ifarch %{with_systemtap}
# Install systemtap support files. # Install systemtap support files.
install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset
cp -a $RPM_BUILD_DIR/%{name}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/ cp -a $RPM_BUILD_DIR/%{name}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/
@ -884,13 +883,13 @@ exit 0
%dir %{_jvmdir}/%{sdkdir}/bin %dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include %dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib %dir %{_jvmdir}/%{sdkdir}/lib
%ifarch %{jit_arches} %ifarch %{with_systemtap}
%dir %{_jvmdir}/%{sdkdir}/tapset %dir %{_jvmdir}/%{sdkdir}/tapset
%endif %endif
%{_jvmdir}/%{sdkdir}/bin/* %{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/* %{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/* %{_jvmdir}/%{sdkdir}/lib/*
%ifarch %{jit_arches} %ifarch %{with_systemtap}
%{_jvmdir}/%{sdkdir}/tapset/*.stp %{_jvmdir}/%{sdkdir}/tapset/*.stp
%endif %endif
%{_jvmdir}/%{sdklnk} %{_jvmdir}/%{sdklnk}
@ -926,7 +925,7 @@ exit 0
%{_mandir}/man1/wsgen-%{name}.1* %{_mandir}/man1/wsgen-%{name}.1*
%{_mandir}/man1/wsimport-%{name}.1* %{_mandir}/man1/wsimport-%{name}.1*
%{_mandir}/man1/xjc-%{name}.1* %{_mandir}/man1/xjc-%{name}.1*
%ifarch %{jit_arches} %ifarch %{with_systemtap}
%{tapsetroot} %{tapsetroot}
%endif %endif