Package: openjdk-6 Version: 6b18-1.8.7-3 Severity: wishlist Tags: patch Hi,
Please support ppc64. Regards, -- Hiroyuki Yamamoto A75D B285 7050 4BF9 AEDA 91AC 3A10 59C6 5203 04DC
diff -Nurd openjdk-6-6b18-1.8.7.orig/debian/control openjdk-6-6b18-1.8.7/debian/control --- openjdk-6-6b18-1.8.7.orig/debian/control 2011-04-24 09:29:44.000000000 +0900 +++ openjdk-6-6b18-1.8.7/debian/control 2011-04-24 21:49:46.000000000 +0900 @@ -3,7 +3,7 @@ Priority: optional Maintainer: OpenJDK Team <[email protected]> Uploaders: Torsten Werner <[email protected]>, Matthias Klose <[email protected]> -Build-Depends: debhelper (>= 5), m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, autoconf, automake, autotools-dev, ant1.7, ant1.7-optional, libtool, g++-4.4 (>= 4.4.1), ecj-gcj [amd64 armel hppa i386 ia64 lpia powerpc powerpcspe m68k mips mipsel sh4 sparc sparc64 s390], gcj-jdk [amd64 armel hppa i386 ia64 lpia powerpc powerpcspe m68k mips mipsel sh4 sparc sparc64 s390], openjdk-6-jdk (>= 6b11) [alpha], libxtst-dev, libxi-dev, libxt-dev, libxp-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxalan2-java, liblcms1-dev, libxinerama-dev, rhino, libffi-dev, llvm-2.7-dev [amd64 i386 lpia armel powerpc], libpng12-dev, zlib1g-dev, libjpeg62-dev, libgif-dev, fastjar (>= 2:0.96-0ubuntu2), libpulse-dev (>= 0.9.12), libnss3-dev (>= 3.12.3), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, metacity | twm, dbus-x11 | twm, x11-xkb-utils, +Build-Depends: debhelper (>= 5), m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, autoconf, automake, autotools-dev, ant1.7, ant1.7-optional, libtool, g++-4.4 (>= 4.4.1), ecj-gcj [amd64 armel hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390], gcj-jdk [amd64 armel hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390], openjdk-6-jdk (>= 6b11) [alpha], libxtst-dev, libxi-dev, libxt-dev, libxp-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxalan2-java, liblcms1-dev, libxinerama-dev, rhino, libffi-dev, llvm-2.7-dev [amd64 i386 lpia armel powerpc], libpng12-dev, zlib1g-dev, libjpeg62-dev, libgif-dev, fastjar (>= 2:0.96-0ubuntu2), libpulse-dev (>= 0.9.12), libnss3-dev (>= 3.12.3), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, metacity | twm, dbus-x11 | twm, x11-xkb-utils, Standards-Version: 3.9.1 Homepage: http://openjdk.java.net/ Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk6-1.8 diff -Nurd openjdk-6-6b18-1.8.7.orig/debian/rules openjdk-6-6b18-1.8.7/debian/rules --- openjdk-6-6b18-1.8.7.orig/debian/rules 2011-04-24 09:29:44.000000000 +0900 +++ openjdk-6-6b18-1.8.7/debian/rules 2011-04-26 01:04:55.000000000 +0900 @@ -83,8 +83,8 @@ with_wgy_zenhai = $(if $(filter $(distrel),lenny gutsy feisty edgy dapper),,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 powerpcspe=ppc sparc=sparc sparc64=sparc64 sh4=sh 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 powerpcspe=ppc sparc=sparc sparc64=sparc64 sh4=sh 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 powerpcspe=ppc ppc64=ppc64 sparc=sparc sparc64=sparc64 sh4=sh 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 powerpcspe=ppc ppc64=ppc64 sparc=sparc sparc64=sparc64 sh4=sh s390=s390 ia64=ia64 jvmarch := $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \ $(filter $(DEB_HOST_ARCH)=%, $(arch_map)))) @@ -93,7 +93,7 @@ default_vm = $(if $(filter $(DEB_HOST_ARCH), $(hotspot_archs)),hotspot,zero) -stage1_gcj_archs = amd64 armel hppa i386 ia64 lpia powerpc powerpcspe m68k mips mipsel sh4 sparc sparc64 s390 +stage1_gcj_archs = amd64 armel hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 stage1_openjdk_archs = alpha stage1_cacao_archs = ifneq (,$(filter nobootstrap, $(DEB_BUILD_OPTIONS))) @@ -313,7 +313,8 @@ DISTRIBUTION_PATCHES += \ $(if $(filter $(DEB_HOST_ARCH), amd64), debian/patches/gcc-jdk-opt-O2.diff) \ $(if $(filter $(DEB_HOST_ARCH), powerpc), debian/patches/gcc-opt-O2.diff) \ - $(if $(filter $(DEB_HOST_ARCH), powerpcspe), debian/patches/gcc-opt-O2.diff) + $(if $(filter $(DEB_HOST_ARCH), powerpcspe), debian/patches/gcc-opt-O2.diff) \ + $(if $(filter $(DEB_HOST_ARCH), ppc64), debian/patches/gcc-opt-O2.diff) else ifeq ($(DEB_HOST_ARCH),s390) # GCC PR target/41327 DISTRIBUTION_PATCHES += debian/patches/gcc-jdk-opt-O2.diff @@ -377,7 +378,7 @@ # see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=217 # only use it for zero ports except powerpc (which we assume as # fast enough to build. -ifeq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs) ia64 powerpc powerpcspe)) +ifeq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs) ia64 powerpc powerpcspe ppc64)) CONFIGURE_ARGS += --with-alt-jar=/usr/bin/fastjar endif @@ -869,19 +870,19 @@ touch $@ ifeq ($(with_check),yes) - ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs) alpha ia64 powerpc powerpcspe s390 sh4)) + ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs) alpha ia64 powerpc powerpcspe ppc64 s390 sh4)) with_mauve_check = $(default_vm) endif - ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs) alpha ia64 mips mipsel powerpc powerpcspe s390 sh4)) + ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs) alpha ia64 mips mipsel powerpc powerpcspe ppc64 s390 sh4)) with_jtreg_check = $(default_vm) endif ifneq (,$(filter cacao, $(alternate_vms))) - ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia powerpc powerpcspe sparc)) + ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 lpia powerpc powerpcspe ppc64 sparc)) # only activate after testing; problems on s390 with_mauve_check += cacao endif - ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 i386 lpia mips mipsel powerpc powerpcspe s390)) + ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 i386 lpia mips mipsel powerpc powerpcspe ppc64 s390)) # only activate after testing; hangs several tests. with_jtreg_check += cacao endif @@ -913,7 +914,7 @@ endif endif -ifneq (,$(filter $(DEB_HOST_ARCH), alpha armel ia64 mips mipsel powerpc powerpcspe s390)) +ifneq (,$(filter $(DEB_HOST_ARCH), alpha armel ia64 mips mipsel powerpc powerpcspe ppc64 s390)) JTREG_OPTIONS = -timeout:3 endif ifneq (,$(filter $(DEB_HOST_ARCH), armel)) @@ -942,7 +943,7 @@ rm -f buildwatch.pid stamps/build: stamps/patch -ifneq (,$(filter $(DEB_HOST_ARCH), alpha arm armel hppa ia64 m68k mips mipsel powerpc powerpcspe s390 sparc)) +ifneq (,$(filter $(DEB_HOST_ARCH), alpha arm armel hppa ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 sparc)) sh -c 'sh debian/buildwatch.sh $(CURDIR)/build &' endif if $(EXTRA_BUILD_ENV) $(MAKE) -C build $(build_target); then \
