changeset in /hg/icedtea6: 2008-04-15 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Tue Apr 15 07:44:51 PDT 2008
changeset fb0a7535db1f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fb0a7535db1f
description:
2008-04-15 Gary Benson <gbenson at redhat.com>
Yi Zhan <yi.zhan at intel.com>
* patches/icedtea-ia64-fdlibm.patch: New file.
* Makefile.am (ICEDTEA_PATCHES): Added the above.
* aclocal.m4, Makefile.in: Regenerated.
diffstat:
5 files changed, 56 insertions(+), 48 deletions(-)
ChangeLog | 7 +++++
Makefile.am | 1
Makefile.in | 36 +++++++++++----------------
aclocal.m4 | 48 ++++++++++++++++---------------------
patches/icedtea-ia64-fdlibm.patch | 12 +++++++++
diffs (236 lines):
diff -r edf310873bf7 -r fb0a7535db1f ChangeLog
--- a/ChangeLog Tue Apr 15 09:36:40 2008 +0200
+++ b/ChangeLog Tue Apr 15 10:44:43 2008 -0400
@@ -1,3 +1,10 @@ 2008-04-15 Christan Thalinger <twisti@
+2008-04-15 Gary Benson <gbenson at redhat.com>
+ Yi Zhan <yi.zhan at intel.com>
+
+ * patches/icedtea-ia64-fdlibm.patch: New file.
+ * Makefile.am (ICEDTEA_PATCHES): Added the above.
+ * aclocal.m4, Makefile.in: Regenerated.
+
2008-04-15 Christan Thalinger <twisti at complang.tuwien.ac.at>
* acinclude.m4 (ENABLE_ZERO_BUILD): Make --disable-zero work and
diff -r edf310873bf7 -r fb0a7535db1f Makefile.am
--- a/Makefile.am Tue Apr 15 09:36:40 2008 +0200
+++ b/Makefile.am Tue Apr 15 10:44:43 2008 -0400
@@ -295,6 +295,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-jpegclasses.patch \
patches/icedtea-xinerama.patch \
patches/icedtea-arm-uname.patch \
+ patches/icedtea-ia64-fdlibm.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
diff -r edf310873bf7 -r fb0a7535db1f Makefile.in
--- a/Makefile.in Tue Apr 15 09:36:40 2008 +0200
+++ b/Makefile.in Tue Apr 15 10:44:43 2008 -0400
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -403,8 +403,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
- $(GCC_PATCH) $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) \
- $(am__append_5)
+ patches/icedtea-ia64-fdlibm.patch $(GCC_PATCH) \
+ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
@@ -549,10 +549,6 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -579,8 +575,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -724,17 +718,17 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am all-local am--refresh check check-am clean \
- clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \
- dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-local distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+ clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \
+ dist-tarZ dist-zip distcheck distclean distclean-generic \
+ distclean-local distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am
# Top-Level Targets
diff -r edf310873bf7 -r fb0a7535db1f aclocal.m4
--- a/aclocal.m4 Tue Apr 15 09:36:40 2008 +0200
+++ b/aclocal.m4 Tue Apr 15 10:44:43 2008 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,10 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
@@ -177,7 +174,7 @@ fi[]dnl
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -192,7 +189,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -208,10 +205,8 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -483,7 +478,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -531,13 +526,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 13
+# 2005, 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 12
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -642,17 +637,16 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
-_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -941,7 +935,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -r edf310873bf7 -r fb0a7535db1f patches/icedtea-ia64-fdlibm.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ia64-fdlibm.patch Tue Apr 15 10:44:43 2008 -0400
@@ -0,0 +1,12 @@
+diff -r 8c25a5a32f56 openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
+--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sun Apr 13 16:00:28 2008 +0100
++++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Tue Apr 15 15:30:59 2008 +0100
+@@ -30,7 +30,7 @@
+ #ifdef __NEWVALID /* special setup for Sun test regime */
+ #if defined(i386) || defined(i486) || \
+ defined(intel) || defined(x86) || \
+- defined(i86pc) || defined(_M_IA64)
++ defined(i86pc) || defined(ia64)
+ #define _LITTLE_ENDIAN
+ #endif
+ #endif
More information about the distro-pkg-dev
mailing list