[openjdk-8] 10/10: Disable JamVM

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 39e9c6dd0d23254ad5b40416e0fc97d105df6d23
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Mar 29 01:08:04 2014 +0100

    Disable JamVM
---
 debian/control           | 24 ++++++++++++------------
 debian/control.jamvm-jre | 24 ++++++++++++------------
 debian/rules             | 24 ++++++++++++------------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index 65b1a92..5786d7e 100644
--- a/debian/control
+++ b/debian/control
@@ -117,18 +117,18 @@ Description: Java runtime based on OpenJDK (debugging symbols)
  The packages are built using the IcedTea build support and patches
  from the IcedTea project.
 
-Package: icedtea-7-jre-jamvm
-Architecture: amd64 armel armhf i386 lpia mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64
-Multi-Arch: same
-Priority: extra
-Pre-Depends: ${dpkg:Depends}
-Depends: openjdk-8-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Alternative JVM for OpenJDK, using JamVM
- The package provides an alternative runtime using the JamVM.  This is a
- somewhat faster alternative than the Zero port on architectures like armel,
- mips, mipsel, powerpc.
- .
- The VM is started with the option `-jamvm'. See the README.Debian for details.
+#Package: icedtea-7-jre-jamvm
+#Architecture: amd64 armel armhf i386 lpia mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64
+#Multi-Arch: same
+#Priority: extra
+#Pre-Depends: ${dpkg:Depends}
+#Depends: openjdk-8-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+#Description: Alternative JVM for OpenJDK, using JamVM
+# The package provides an alternative runtime using the JamVM.  This is a
+# somewhat faster alternative than the Zero port on architectures like armel,
+# mips, mipsel, powerpc.
+# .
+# The VM is started with the option `-jamvm'. See the README.Debian for details.
 
 Package: openjdk-8-jre-zero
 Architecture: amd64 i386 arm64 lpia kfreebsd-amd64 kfreebsd-i386 
diff --git a/debian/control.jamvm-jre b/debian/control.jamvm-jre
index dd3923f..df309f8 100644
--- a/debian/control.jamvm-jre
+++ b/debian/control.jamvm-jre
@@ -1,13 +1,13 @@
 
-Package: icedtea-7-jre-jamvm
-Architecture: @jamvm_archs@
-Multi-Arch: same
-Priority: extra
-Pre-Depends: ${dpkg:Depends}
-Depends: @basename at -jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Alternative JVM for OpenJDK, using JamVM
- The package provides an alternative runtime using the JamVM.  This is a
- somewhat faster alternative than the Zero port on architectures like armel,
- mips, mipsel, powerpc.
- .
- The VM is started with the option `-jamvm'. See the README.Debian for details.
+#Package: icedtea-7-jre-jamvm
+#Architecture: @jamvm_archs@
+#Multi-Arch: same
+#Priority: extra
+#Pre-Depends: ${dpkg:Depends}
+#Depends: @basename at -jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+#Description: Alternative JVM for OpenJDK, using JamVM
+# The package provides an alternative runtime using the JamVM.  This is a
+# somewhat faster alternative than the Zero port on architectures like armel,
+# mips, mipsel, powerpc.
+# .
+# The VM is started with the option `-jamvm'. See the README.Debian for details.
diff --git a/debian/rules b/debian/rules
index e5c18b9..72c2118 100755
--- a/debian/rules
+++ b/debian/rules
@@ -197,11 +197,11 @@ ifeq (,$(filter noaltzero, $(DEB_BUILD_OPTIONS))$(filter noaltshark, $(DEB_BUILD
     endif
   endif
 endif
-ifeq (,$(filter noaltjamvm, $(DEB_BUILD_OPTIONS)))
-  ifneq (,$(filter $(DEB_HOST_ARCH), $(jamvm_archs)))
-    alternate_vms += jamvm
-  endif
-endif
+#ifeq (,$(filter noaltjamvm, $(DEB_BUILD_OPTIONS)))
+#  ifneq (,$(filter $(DEB_HOST_ARCH), $(jamvm_archs)))
+#    alternate_vms += jamvm
+#  endif
+#endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), $(stage1_gcj_archs)))
   STAGE1_JAVA = gcj
@@ -569,10 +569,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(cacao_archs)))
   endif
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH), $(jamvm_archs)))
-  CONFIGURE_ARGS += \
-	--with-jamvm-src-zip=$(firstword $(wildcard $(CURDIR)/jamvm-*.tar.* /usr/src/jamvm-*.tar.*))
-endif
+#ifneq (,$(filter $(DEB_HOST_ARCH), $(jamvm_archs)))
+#  CONFIGURE_ARGS += \
+#	--with-jamvm-src-zip=$(firstword $(wildcard $(CURDIR)/jamvm-*.tar.* /usr/src/jamvm-*.tar.*))
+#endif
 
 ifeq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs)))
   CONFIGURE_ARGS += --enable-zero
@@ -770,9 +770,9 @@ ifeq ($(with_systemtap),yes)
   bd_systemtap = systemtap-sdt-dev,
 endif
 
-ifneq (,$(jamvm_archs))
-  bd_jamvm = libtool,
-endif
+#ifneq (,$(jamvm_archs))
+#  bd_jamvm = libtool,
+#endif
 
 dlopen_hl_depends = \
 	$(if $(filter $(distrel), etch),libcupsys2,libcups2), \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git