openjdk team mailing list archive

[John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>]

Hi!

On 11/23/2015 02:07 AM, David Matthew Mattli wrote:
> If sparc64 is added to the list of hotspot archs and this patch
> included in DISTRIBUTION_PATCHES in debian/rules should fix the
> build for sparc64.

I have applied David's changes and successfully built an openjdk-7
package which I just uploaded to 'unreleased'.

The changes can be safely implemented in the sense that they affect
sparc64 only and therefore should not introduce regressions on any
other architectures. See my attached debdiff.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@xxxxxxxxxx
`. `'   Freie Universitaet Berlin - glaubitz@xxxxxxxxxxxxxxxxxxx
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

diff -Nru openjdk-7-7u91-2.6.3/debian/changelog openjdk-7-7u91-2.6.3/debian/changelog
--- openjdk-7-7u91-2.6.3/debian/changelog	2015-11-19 01:27:54.000000000 +0100
+++ openjdk-7-7u91-2.6.3/debian/changelog	2015-11-23 16:47:36.000000000 +0100
@@ -1,3 +1,11 @@
+openjdk-7 (7u91-2.6.3-1+sparc64) unreleased; urgency=medium
+
+  * Configure sparc64 as hotspot architecture in debian/rules.
+  * Add debian/patches/sparc-libproc-fix.diff to include missing
+    headers on sparc64.
+
+ -- John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxx>  Mon, 23 Nov 2015 16:45:57 +0100
+
 openjdk-7 (7u91-2.6.3-1) unstable; urgency=medium
 
   [ Tiago Stürmer Daitx ]
diff -Nru openjdk-7-7u91-2.6.3/debian/patches/sparc-libproc-fix.diff openjdk-7-7u91-2.6.3/debian/patches/sparc-libproc-fix.diff
--- openjdk-7-7u91-2.6.3/debian/patches/sparc-libproc-fix.diff	1970-01-01 01:00:00.000000000 +0100
+++ openjdk-7-7u91-2.6.3/debian/patches/sparc-libproc-fix.diff	2015-11-23 16:37:07.000000000 +0100
@@ -0,0 +1,12 @@
+Index: openjdk/hotspot/agent/src/os/linux/libproc.h
+===================================================================
+--- openjdk/hotspot/agent/src/os/linux/libproc.h.old	2015-11-12 22:57:20.000000000 -0600
++++ openjdk/hotspot/agent/src/os/linux/libproc.h		2015-11-22 10:49:17.684049960 -0600
+@@ -34,6 +34,7 @@
+ #include "libproc_md.h"
+ #endif
+ 
++#include <asm/ptrace.h>
+ #include <sys/ptrace.h>
+ 
+ /************************************************************************************
diff -Nru openjdk-7-7u91-2.6.3/debian/rules openjdk-7-7u91-2.6.3/debian/rules
--- openjdk-7-7u91-2.6.3/debian/rules	2015-11-19 01:44:00.000000000 +0100
+++ openjdk-7-7u91-2.6.3/debian/rules	2015-11-23 16:45:45.000000000 +0100
@@ -41,7 +41,7 @@
   endif
 endif
 
-hotspot_archs	= amd64 i386 arm64 lpia ppc64 ppc64el sparc kfreebsd-amd64 kfreebsd-i386
+hotspot_archs	= amd64 i386 arm64 lpia ppc64 ppc64el sparc kfreebsd-amd64 kfreebsd-i386 sparc64
 # requires llvm; llvm in jaunty is recent enough, but in universe
 ifeq (,$(filter $(distrel),lenny jaunty intrepid hardy))
   shark_archs	= amd64 i386 lpia kfreebsd-amd64 kfreebsd-i386
@@ -438,6 +438,11 @@
 	debian/patches/s390_hotspot_fix.diff
 endif
 
+ifneq (,$(filter $(DEB_HOST_ARCH), sparc64))
+  DISTRIBUTION_PATCHES += \
+	debian/patches/sparc-libproc-fix.diff
+endif
+
 DISTRIBUTION_PATCHES += \
 	debian/patches/icedtea-override-redirect-compiz.patch \
 	debian/patches/icedtea-4953367.patch \