/hg/icedtea7: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 8301bc66941a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=8301bc66941a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 21 18:50:13 2011 +0100

	Enable checking for syscalls during configure and compiling against
	them.

	2011-09-21 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (ICEDTEA_ENV): Set
	COMPILE_AGAINST_SYSCALLS if USE_SYSCALL_COMPILATION is set.
		* acinclude.m4: (IT_CHECK_FOR_SYSCALLS): Add --enable-compile-
	against-syscalls which checks for various syscalls
	(epolling, extended attributes,
		*at).
		* configure.ac: Call IT_CHECK_FOR_SYSCALLS.


changeset e8227389e2e0 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e8227389e2e0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 21 18:56:43 2011 +0100

	Bump to latest JDK repo. with Damian's CUPS build fix.

	2011-09-21 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (JDK_CHANGESET): Include Damian's
	compilation fix for building without USE_SYSTEM_CUPS.
	(JDK_SHA256SUM): Likewise.


diffstat:

 ChangeLog    |  18 ++++++++++++++++++
 Makefile.am  |   9 +++++++--
 acinclude.m4 |  21 +++++++++++++++++++++
 configure.ac |   1 +
 4 files changed, 47 insertions(+), 2 deletions(-)

diffs (100 lines):

diff -r 772a1342ad73 -r e8227389e2e0 ChangeLog
--- a/ChangeLog	Wed Sep 21 16:16:01 2011 +0100
+++ b/ChangeLog	Wed Sep 21 18:56:43 2011 +0100
@@ -1,3 +1,21 @@
+2011-09-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(JDK_CHANGESET): Include Damian's compilation fix
+	for building without USE_SYSTEM_CUPS.
+	(JDK_SHA256SUM): Likewise.
+
+2011-09-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_ENV): Set COMPILE_AGAINST_SYSCALLS
+	if USE_SYSCALL_COMPILATION is set.
+	* acinclude.m4:
+	(IT_CHECK_FOR_SYSCALLS): Add --enable-compile-against-syscalls
+	which checks for various syscalls (epolling, extended attributes,
+	*at).
+	* configure.ac: Call IT_CHECK_FOR_SYSCALLS.
+
 2011-09-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 772a1342ad73 -r e8227389e2e0 Makefile.am
--- a/Makefile.am	Wed Sep 21 16:16:01 2011 +0100
+++ b/Makefile.am	Wed Sep 21 18:56:43 2011 +0100
@@ -6,7 +6,7 @@
 HOTSPOT_CHANGESET = 1dd9b3d73b22
 JAXP_CHANGESET = c40983d6ae70
 JAXWS_CHANGESET = 83db5e316798
-JDK_CHANGESET = a8b6a570543b
+JDK_CHANGESET = 0cb15650412a
 LANGTOOLS_CHANGESET = fb7fb3071b64
 OPENJDK_CHANGESET = 3defd24c2671
 
@@ -14,7 +14,7 @@
 HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150
 JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d
 JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21
-JDK_SHA256SUM = bab2b25355dfb4300912b199eaf9633e693368e3fb671f1f6e9e08622079faeb
+JDK_SHA256SUM = ef2310b4df9e8a7891b927846badadf5441df8ac6203a215c8ef1a7676dfee36
 LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
 OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
 
@@ -570,6 +570,11 @@
 	FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
 endif
 
+if USE_SYSCALL_COMPILATION
+ICEDTEA_ENV += \
+	COMPILE_AGAINST_SYSCALLS="true"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
diff -r 772a1342ad73 -r e8227389e2e0 acinclude.m4
--- a/acinclude.m4	Wed Sep 21 16:16:01 2011 +0100
+++ b/acinclude.m4	Wed Sep 21 18:56:43 2011 +0100
@@ -2147,6 +2147,27 @@
   AC_SUBST(CUPS_LIBS)
 ])
 
+AC_DEFUN_ONCE([IT_CHECK_FOR_SYSCALLS],
+[
+  AC_MSG_CHECKING([whether to build against the required syscalls])
+  AC_ARG_ENABLE([compile-against-syscalls],
+	      [AS_HELP_STRING(--enable-compile-against-syscalls,compile against syscalls [[default=yes]])],
+  [
+    ENABLE_SYSCALL_COMPILATION="${enableval}"
+  ],
+  [
+    ENABLE_SYSCALL_COMPILATION="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_SYSCALL_COMPILATION})
+  if test x"${ENABLE_SYSCALL_COMPILATION}" = "xyes"; then
+    dnl Check for syscalls
+    AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],,
+      [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])])
+  fi
+  AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xyes")
+  AC_SUBST(ENABLE_SYSCALL_COMPILATION)
+])
+
 AC_DEFUN([IT_ENABLE_JAMVM],
 [
   AC_MSG_CHECKING(whether to use JamVM as VM)
diff -r 772a1342ad73 -r e8227389e2e0 configure.ac
--- a/configure.ac	Wed Sep 21 16:16:01 2011 +0100
+++ b/configure.ac	Wed Sep 21 18:56:43 2011 +0100
@@ -174,6 +174,7 @@
 IT_CHECK_FOR_GIO
 IT_CHECK_FOR_FONTCONFIG
 IT_CHECK_FOR_CUPS
+IT_CHECK_FOR_SYSCALLS
 AC_CONFIG_FILES([remove-intree-libraries.sh])
 
 dnl Check for Xproto headers and libraries.