Bug#760160: openjdk-7: FTBFS[openjdk-7]: regression in jamvm build system?

[Steven Chamberlain <steven@pyro.eu.org>]

Package: openjdk-7
Version: 7u65-2.5.2-1
Severity: serious
Tags: patch

Hi,

jamvm/configure.ac had been patched for kfreebsd-amd64, but the
configure file is no longer being generated from it during the
build.

If that was an intended change, we'll need to amend
kfreebsd-support-jamvm.diff to patch the configure file shipped by
upstream.  (Please find new version of this patch attached).

Thanks.

https://buildd.debian.org/status/fetch.php?pkg=openjdk-7&arch=kfreebsd-amd64&ver=7u65-2.5.1-5&stamp=1408934369
| cd jamvm/jamvm && \
| ./autogen.sh --with-java-runtime-library=openjdk7 \
|   --prefix=/«PKGBUILDDIR»/build/jamvm/install \
|   CFLAGS='-g -fstack-protector-strong -Wformat -Werror=format-security -O3' LDFLAGS='-Wl,-z,relro' CPPFLAGS='-D_FORTIFY_SOURCE=2' CXXFLAGS='-g -fstack-protector-strong -Wformat -Werror=format-security -O3'; \
| /usr/bin/make ; \
| /usr/bin/make install

https://buildd.debian.org/status/fetch.php?pkg=openjdk-7&arch=kfreebsd-amd64&ver=7u65-2.5.2-1&stamp=1409569283
| cd jamvm/jamvm && \
| ./configure --with-java-runtime-library=openjdk7 \
|   --prefix=/«PKGBUILDDIR»/build/jamvm/install \
|   CFLAGS='-g -fstack-protector-strong -Wformat -Werror=format-security -O3' LDFLAGS='-Wl,-z,relro' CPPFLAGS='-D_FORTIFY_SOURCE=2' CXXFLAGS='-g -fstack-protector-strong -Wformat -Werror=format-security -O3'; \
| /usr/bin/make ; \
| /usr/bin/make install

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 9.0-2-amd64-xenhvm-ipsec
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Description: 
 - Add iddef TIOCINQ = FIONREAD
 jamvm/src/classlib/openjdk/jvm.c
 - Update configure for kfreebsd-amd64
 jamvm/jamvm/configure.ac
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2011-08-05
Forwarded: no
--- jamvm/jamvm/configure.orig
+++ jamvm/jamvm/configure
@@ -39,6 +39,7 @@
 i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
 i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
 x86_64-*-linux*) host_os=linux ;;
+x86_64-*-kfreebsd*) host_os=linux ;;
 hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
 mips*-*-linux*) host_cpu=mips host_os=linux ;;
 x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
--- jamvm/jamvm/configure.ac.orig
+++ jamvm/jamvm/configure.ac
@@ -39,6 +39,7 @@
 i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
 i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
 x86_64-*-linux*) host_os=linux ;;
+x86_64-*-kfreebsd*) host_os=linux ;;
 hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
 mips*-*-linux*) host_cpu=mips host_os=linux ;;
 x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
--- jamvm/jamvm/src/classlib/openjdk/jvm.c.orig
+++ jamvm/jamvm/src/classlib/openjdk/jvm.c
@@ -64,6 +64,10 @@
 #define have_monotonic_clock FALSE
 #endif
 
+#ifndef TIOCINQ
+#define TIOCINQ FIONREAD
+#endif
+
 static Class *cloneable_class, *constant_pool_class;
 static Class *exception_class, *runtime_excp_class;