Control: tags -1 + patch Hi,
John Paul Adrian Glaubitz wrote: > Could you please apply all three suggested changes? > i.e., the one from Message #10 and the ones from #20? I'm not the maintainer, and doko may know a better way to fix this, but I've attached the whole thing combined as one patch. Regards, -- Steven Chamberlain ste...@pyro.eu.org
diff -Nru openjdk-8.orig/debian/patches/sparc64-support.diff openjdk-8/debian/patches/sparc64-support.diff --- openjdk-8.orig/debian/patches/sparc64-support.diff 1970-01-01 01:00:00.000000000 +0100 +++ openjdk-8/debian/patches/sparc64-support.diff 2015-11-26 17:34:27.633069173 +0000 @@ -0,0 +1,31 @@ +--- a/common/autoconf/generated-configure.sh ++++ b/common/autoconf/generated-configure.sh +@@ -6881,7 +6881,7 @@ + VAR_CPU_BITS=32 + VAR_CPU_ENDIAN=big + ;; +- sparcv9) ++ sparcv9|sparc64) + VAR_CPU=sparcv9 + VAR_CPU_ARCH=sparc + VAR_CPU_BITS=64 +@@ -7030,7 +7030,7 @@ + VAR_CPU_BITS=32 + VAR_CPU_ENDIAN=big + ;; +- sparcv9) ++ sparcv9|sparc64) + VAR_CPU=sparcv9 + VAR_CPU_ARCH=sparc + VAR_CPU_BITS=64 +--- a/common/autoconf/platform.m4 ++++ b/common/autoconf/platform.m4 +@@ -157,7 +157,7 @@ + VAR_CPU_BITS=32 + VAR_CPU_ENDIAN=big + ;; +- sparcv9) ++ sparcv9|sparc64) + VAR_CPU=sparcv9 + VAR_CPU_ARCH=sparc + VAR_CPU_BITS=64 diff -Nru openjdk-8.orig/debian/rules openjdk-8/debian/rules --- openjdk-8.orig/debian/rules 2015-11-26 17:32:14.000000000 +0000 +++ openjdk-8/debian/rules 2015-11-26 17:34:40.619023208 +0000 @@ -124,7 +124,7 @@ with_wgy_zenhai = $(if $(filter $(distrel),lenny),,yes) -arch_map := alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i586 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32 +arch_map := alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i586 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparcv9 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32 archdir_map := alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparcv9 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32 jvmarch := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, \ @@ -416,6 +416,7 @@ sparc-fixes.diff \ jdk-target-arch-define.diff \ m68k-support.diff \ + sparc64-support.diff \ javadoc-sort-enum-and-annotation-types.diff \ # FIXME: update patches
signature.asc
Description: Digital signature
