rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.121,1.122

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14852

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Wed May 21 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
- Disable building systemtap on non-jit arches.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- java-1.6.0-openjdk.spec	19 May 2009 13:36:19 -0000	1.121
+++ java-1.6.0-openjdk.spec	20 May 2009 14:21:35 -0000	1.122
@@ -4,7 +4,7 @@
 %define gcjbootstrap 0
 
 # If runtests is 0 test suites will not be run.
-%define runtests 0
+%define runtests 1
 
 %define icedteaver 1.5
 %define icedteasnapshot -ea3bc7968a1cb39f1dab305ace06306b36f0f832
@@ -67,8 +67,12 @@
 %if %{gcjbootstrap}
 %define icedteaopt %{nil}
 %else
+%ifarch %{jit_arches}
+%define icedteaopt --with-openjdk --enable-systemtap
+%else
 %define icedteaopt --with-openjdk
 %endif
+%endif
 
 # Convert an absolute path to a relative path.  Each symbolic link is
 # specified relative to the directory in which it is installed so that
@@ -115,12 +119,14 @@
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}
 %endif
 
+%ifarch %{jit_arches}
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,
 # but currently systemtap doesn't support that, so we have to
 # use the root tapset dir for now.
 #%define tapsetdir	/usr/share/systemtap/tapset/%{sdkdir}
 %define tapsetdir	/usr/share/systemtap/tapset
+%endif
 
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack 0
@@ -222,8 +228,10 @@ BuildRequires: pulseaudio >= 0.9.11
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
 %endif
+%ifarch %{jit_arches}
 #systemtap build requirement.
 BuildRequires: systemtap-sdt-devel
+%endif
 # visualvm build requirements.
 BuildRequires: netbeans
 BuildRequires: jakarta-commons-logging
@@ -396,7 +404,7 @@ export CFLAGS="$CFLAGS -mieee"
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --enable-visualvm --with-hotspot-src-zip=%{SOURCE7} --enable-systemtap \
+  --enable-visualvm --with-hotspot-src-zip=%{SOURCE7} \
   --with-abs-install-dir=$RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
@@ -466,6 +474,7 @@ pushd %{buildoutputdir}/j2sdk-image
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
   cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
 
+%ifarch %{jit_arches}
   # Install systemtap support files.
   cp -a tapset $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
   install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}
@@ -473,6 +482,7 @@ pushd %{buildoutputdir}/j2sdk-image
     RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
     ln -sf $RELATIVE/*stp .
   popd
+%endif
 
 %if 0%{?fedora} > 9
   # Install cacerts symlink.
@@ -882,11 +892,15 @@ exit 0
 %dir %{_jvmdir}/%{sdkdir}/bin
 %dir %{_jvmdir}/%{sdkdir}/include
 %dir %{_jvmdir}/%{sdkdir}/lib
+%ifarch %{jit_arches}
 %dir %{_jvmdir}/%{sdkdir}/tapset
+%endif
 %{_jvmdir}/%{sdkdir}/bin/*
 %{_jvmdir}/%{sdkdir}/include/*
 %{_jvmdir}/%{sdkdir}/lib/*
+%ifarch %{jit_arches}
 %{_jvmdir}/%{sdkdir}/tapset/*.stp
+%endif
 %{_jvmdir}/%{sdklnk}
 %{_jvmjardir}/%{sdklnk}
 %{_datadir}/applications/*jconsole.desktop
@@ -919,7 +933,9 @@ exit 0
 %{_mandir}/man1/wsimport-%{name}.1*
 %{_mandir}/man1/xjc-%{name}.1*
 %{_datadir}/applications/visualvm.desktop
+%ifarch %{jit_arches}
 %{tapsetdir}/*.stp
+%endif
 
 %files demo -f %{name}-demo.files
 %defattr(-,root,root,-)
@@ -944,6 +960,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Wed May 21 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
+- Disable building systemtap on non-jit arches.
+
 * Tue May 19 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
 - Set icedteasnapshot. Only release candidate.