openjdk-6 rules diff
Hi folks,
I can't seem to get anywhere with openjdk-6 at the moment. But if
someone with lots of memory/swap space wants to try it, attached are the
changes I made to debian/rules. I do know that enabling cacao seems to
cause problems.
Thanks,
Barry
--- debian/rules.orig 2009-05-26 10:47:31.650000000 -0400
+++ debian/rules 2009-05-24 16:28:32.150000000 -0400
@@ -25,8 +25,8 @@
PKGSOURCE := $(call vafilt,$(CHANGELOG_VARS),Source)
PKGVERSION := $(call vafilt,$(CHANGELOG_VARS),Version)
-hotspot_archs = amd64 i386 lpia sparc
-shark_archs = amd64 i386 lpia
+hotspot_archs = amd64 i386 lpia sparc hurd-i386
+shark_archs = amd64 i386 lpia hurd-i386
shark_archs =
no_bootstrap_archs = alpha armel
@@ -84,8 +84,8 @@
with_wgy_zenhai = $(if $(filter $(distrel),hardy intrepid jaunty karmic squeeze sid),yes)
-arch_map := alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc i386=i586 lpia=i586 m68k=m68k mips=mips mipsel=mipsel powerpc=ppc sparc=sparc s390=s390 ia64=ia64
-archdir_map := alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc i386=i386 lpia=i386 m68k=m68k mips=mips mipsel=mipsel powerpc=ppc sparc=sparc s390=s390 ia64=ia64
+arch_map := alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc i386=i586 lpia=i586 m68k=m68k mips=mips mipsel=mipsel powerpc=ppc sparc=sparc s390=s390 ia64=ia64 hurd-i386=i586
+archdir_map := alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc i386=i386 lpia=i386 m68k=m68k mips=mips mipsel=mipsel powerpc=ppc sparc=sparc s390=s390 ia64=ia64 hurd-i386=i386
jvmarch := $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
$(filter $(DEB_HOST_ARCH)=%, $(arch_map))))
@@ -94,7 +94,7 @@
default_vm = $(if $(filter $(DEB_HOST_ARCH), $(hotspot_archs)),hotspot,zero)
-stage1_gcj_archs = amd64 hppa i386 ia64 lpia powerpc m68k mips mipsel sparc s390
+stage1_gcj_archs = amd64 hppa i386 hurd-i386 ia64 lpia powerpc m68k mips mipsel sparc s390
stage1_openjdk_archs = alpha armel
stage1_cacao_archs =
@@ -155,7 +155,7 @@
endif
ifneq (,$(filter $(distrel),jaunty karmic unstable experimental sid))
- with_pulse = yes
+ with_pulse = no
endif
ifneq (,$(filter $(distrel),karmic sid squeeze))
@@ -297,7 +297,7 @@
# assume we don't build binary indep packages on these architectures
ifeq ($(with_docs),yes)
- ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
+ ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia hurd-i386))
CONFIGURE_ARGS += --disable-docs
endif
else
@@ -580,7 +577,7 @@
-e 's/@cjk_fonts@/$(cjk_fonts)/g' \
$$f > $$f2; \
done
-ifneq (,$(filter $(DEB_HOST_ARCH), i386 lpia))
+ifneq (,$(filter $(DEB_HOST_ARCH), i386 lpia hurd-i386))
# not yet in OpenJDK
# cat debian/$(p_jre)-i586.menu >> $(d_jre).menu
rm -f debian/$(p_jre)-i586.menu
@@ -645,22 +642,22 @@
endif
ifneq (,$(filter cacao, $(alternate_vms)))
- ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia powerpc sparc))
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia hurd-i386 powerpc sparc))
# only activate after testing; problems on s390
with_mauve_check += cacao
endif
- ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 lpia mips mipsel powerpc s390))
+ ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 hurd-i386 lpia mips mipsel powerpc s390))
# only activate after testing; hangs several tests.
with_jtreg_check += cacao
endif
endif
ifneq (,$(filter zero, $(alternate_vms)))
- ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 hurd-i386 lpia))
# only activate after testing
with_mauve_check += zero
endif
- ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia))
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 hurd-i386 lpia))
# only activate after testing; hangs several tests.
with_jtreg_check += zero
endif
Reply to: