/hg/release/icedtea6-1.13: 2 new changesets

[andrew at icedtea.classpath.org]

changeset fa97228fa384 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=fa97228fa384
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jan 23 18:46:47 2014 +0000

	Remove unneeded jdk_generic_profile.sh patch that breaks when system LCMS is disabled.

	2014-01-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/alternative_krb5_cache_fixup.patch:
		Remove unneeded jdk_generic_profile.sh fragment
		that doesn't apply when system LCMS is disabled.


changeset 8796f8cdd621 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=8796f8cdd621
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jan 23 18:56:55 2014 +0000

	Disable LCMS2 system library check when LCMS2 isn't required.

	2014-01-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		* acinclude.m4:
		(IT_CHECK_FOR_LCMS): Depend on IT_ENABLE_LCMS2
		and only enable system LCMS by default if it's
		enabled.
		* configure.ac:
		Don't invoke IT_ENABLE_LCMS2 explicitly.


diffstat:

 ChangeLog                                  |  15 +++++++++++++++
 acinclude.m4                               |   3 ++-
 configure.ac                               |   5 +----
 patches/alternative_krb5_cache_fixup.patch |  18 ------------------
 4 files changed, 18 insertions(+), 23 deletions(-)

diffs (89 lines):

diff -r f49a6db8092f -r 8796f8cdd621 ChangeLog
--- a/ChangeLog	Thu Jan 23 00:53:36 2014 +0000
+++ b/ChangeLog	Thu Jan 23 18:56:55 2014 +0000
@@ -1,3 +1,18 @@
+2014-01-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_FOR_LCMS): Depend on IT_ENABLE_LCMS2
+	and only enable system LCMS by default if it's
+	enabled.
+	* configure.ac:
+	Don't invoke IT_ENABLE_LCMS2 explicitly.
+
+2014-01-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/alternative_krb5_cache_fixup.patch:
+	Remove unneeded jdk_generic_profile.sh fragment
+	that doesn't apply when system LCMS is disabled.
+
 2014-01-23  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* configure.ac: Set to 1.13.2pre.
diff -r f49a6db8092f -r 8796f8cdd621 acinclude.m4
--- a/acinclude.m4	Thu Jan 23 00:53:36 2014 +0000
+++ b/acinclude.m4	Thu Jan 23 18:56:55 2014 +0000
@@ -1537,6 +1537,7 @@
 
 AC_DEFUN_ONCE([IT_CHECK_FOR_LCMS],
 [
+  AC_REQUIRE([IT_ENABLE_LCMS2])
   AC_MSG_CHECKING([whether to use the system LCMS install])
   AC_ARG_ENABLE([system-lcms],
 	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])],
@@ -1544,7 +1545,7 @@
     ENABLE_SYSTEM_LCMS="${enableval}"
   ],
   [
-    if test x"${target_os}" = "xlinux-gnu"; then
+    if test x"${ENABLE_LCMS2}" = "xyes" -a x"${target_os}" = "xlinux-gnu" ; then
       ENABLE_SYSTEM_LCMS="yes" ;
     else
       ENABLE_SYSTEM_LCMS="no" ;
diff -r f49a6db8092f -r 8796f8cdd621 configure.ac
--- a/configure.ac	Thu Jan 23 00:53:36 2014 +0000
+++ b/configure.ac	Thu Jan 23 18:56:55 2014 +0000
@@ -296,10 +296,6 @@
 IT_WITH_PAX
 AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
 
-IT_ENABLE_LCMS2
-
-IT_CHECK_FOR_KERBEROS
-
 dnl pkgconfig cannot be used to find these headers and libraries.
 AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
 	,[AC_MSG_ERROR([Could not find CUPS headers;
@@ -313,6 +309,7 @@
 IT_CHECK_FOR_PNG
 IT_CHECK_FOR_GIF
 IT_CHECK_FOR_LCMS
+IT_CHECK_FOR_KERBEROS
 AC_CONFIG_FILES([remove-intree-libraries.sh])
 
 dnl Check for Xproto headers and libraries.
diff -r f49a6db8092f -r 8796f8cdd621 patches/alternative_krb5_cache_fixup.patch
--- a/patches/alternative_krb5_cache_fixup.patch	Thu Jan 23 00:53:36 2014 +0000
+++ b/patches/alternative_krb5_cache_fixup.patch	Thu Jan 23 18:56:55 2014 +0000
@@ -1,21 +1,3 @@
-diff -Nru openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh
---- openjdk.orig/jdk/make/jdk_generic_profile.sh	2013-08-30 02:41:17.276807687 +0100
-+++ openjdk/jdk/make/jdk_generic_profile.sh	2013-08-30 12:11:12.428923185 +0100
-@@ -467,5 +467,14 @@
- export LCMS_CFLAGS
- export LCMS_LIBS
- 
-+# Export variables for system krb5
-+# KRB5_CFLAGS and KRB5_LIBS tell the compiler how to compile and
-+# link against Kerberos
-+if [ "${KRB5_LIBS}" = "" ] ; then
-+    KRB5_LIBS="-lkrb5"
-+fi
-+export KRB5_LIBS
-+
- # IcedTea defaults; use system libraries
- export SYSTEM_LCMS=true
-+export SYSTEM_KRB5=true
 diff -Nru openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile
 --- openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile	2013-08-30 02:41:17.408809749 +0100
 +++ openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile	2013-08-30 12:10:34.336330523 +0100