changeset in /hg/icedtea6: Merge tip
Mark Wielaard
mark at klomp.org
Sun Jun 29 12:44:21 PDT 2008
changeset f6f00c3a9758 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f6f00c3a9758
description:
Merge tip
diffstat:
7 files changed, 536 insertions(+), 313 deletions(-)
ChangeLog | 22 +
HACKING | 1
Makefile.am | 69 +++
Makefile.in | 73 +++
aclocal.m4 | 22 -
configure | 646 ++++++++++++++++++---------------
patches/icedtea-jdk-docs-target.patch | 16
diffs (truncated from 1567 to 500 lines):
diff -r e81b34d95ce6 -r f6f00c3a9758 ChangeLog
--- a/ChangeLog Sun Jun 29 21:31:52 2008 +0200
+++ b/ChangeLog Sun Jun 29 21:42:50 2008 +0200
@@ -5,6 +5,28 @@ 2008-06-29 Mark Wielaard <mark at klomp.o
(stamps/cacao.stamp): Add dependency on stamps/rt-class-files.stamp.
* Makefile.in: Regenerated.
+2008-06-29 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am: Add ICEDTEA_FSG_PATCHES
+ to EXTRA_DIST.
+ * Makefile.in: Regenerated.
+
+2008-06-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Separate out ICEDTEA_FSG_PATCHES and
+ add dist-openjdk-fsg target.
+ * Makefile.in,
+ * aclocal.m4,
+ * configure:
+ Regenerated.
+
+2008-06-29 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-jdk-docs-target.patch: New.
+ * Makefile.am: Apply patch.
+ * Makefile.in: Regenerate.
+
2008-06-27 Joshua Sumali <jsumali at redhat.com>
* rt/net/sourceforge/jnlp/services/XPersistenceService.java: Throw a
diff -r e81b34d95ce6 -r f6f00c3a9758 HACKING
--- a/HACKING Sun Jun 29 21:31:52 2008 +0200
+++ b/HACKING Sun Jun 29 21:42:50 2008 +0200
@@ -64,6 +64,7 @@ The following patches are only applied t
* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
+* icedtea-jdk-docs-target.patch: Always set DOCS_TARGET.
The following patches are only applied to OpenJDK in IcedTea:
diff -r e81b34d95ce6 -r f6f00c3a9758 Makefile.am
--- a/Makefile.am Sun Jun 29 21:31:52 2008 +0200
+++ b/Makefile.am Sun Jun 29 21:42:50 2008 +0200
@@ -38,8 +38,8 @@ install:
clean-copy clean-hotspot-tools clean-rt clean-gcjwebplugin \
hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports
-EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
- gcjwebplugin.cc tools-copy contrib ports \
+EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_FSG_PATCHES) \
+ $(ICEDTEA_ECJ_PATCH) gcjwebplugin.cc tools-copy contrib ports \
patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
patches/icedtea-cacao.patch javaws.png javaws.desktop \
patches/icedtea-netx-plugin.patch \
@@ -325,6 +325,12 @@ else
SHARK_PATCH =
endif
+ICEDTEA_FSG_PATCHES = \
+ patches/icedtea-license-headers.patch \
+ patches/icedtea-idl.patch \
+ patches/icedtea-jscheme.patch \
+ $(DISTRIBUTION_PATCHES)
+
ICEDTEA_PATCHES = \
$(ZERO_PATCHES_COND) \
patches/icedtea-copy-plugs.patch \
@@ -333,7 +339,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-graphics.patch \
patches/icedtea-debuginfo.patch \
patches/icedtea-ssl.patch \
- patches/icedtea-license-headers.patch \
patches/icedtea-webservices.patch \
patches/icedtea-netx-plugin.patch \
patches/icedtea-rmi_amd64.patch \
@@ -374,15 +379,13 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
patches/icedtea-no-bcopy.patch \
- patches/icedtea-jscheme.patch \
patches/icedtea-dnd-updatecursor.patch \
patches/icedtea-component.patch \
- patches/icedtea-idl.patch \
patches/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
+ patches/icedtea-jdk-docs-target.patch \
$(SHARK_PATCH) \
- $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES)
+ $(GCC_PATCH)
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -418,7 +421,7 @@ clean-extract:
clean-extract:
rm -f stamps/extract.stamp
-stamps/patch.stamp: stamps/extract.stamp
+stamps/patch.stamp: stamps/patch-fsg.stamp
all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
@@ -459,6 +462,47 @@ clean-patch:
echo "WARNING Not all patches reverted cleanly" ; \
fi
+stamps/patch-fsg.stamp: stamps/extract.stamp
+ all_patches_ok=yes; \
+ for p in $(ICEDTEA_FSG_PATCHES) ; \
+ do \
+ if test x$${all_patches_ok} == "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Applying $$p ; \
+ $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
+ else \
+ test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
+ fi ; \
+ done ; \
+ mkdir -p stamps ; \
+ touch stamps/patch-fsg.stamp ; \
+ if ! test x$${all_patches_ok} == "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-patch before retrying a fix ; \
+ false; \
+ fi
+
+
+clean-patch-fsg:
+ rm -f stamps/patch-fsg.stamp
+ all_patches_ok=yes; \
+ for p in $(ICEDTEA_FSG_PATCHES) ; \
+ do \
+ echo Checking $$p ; \
+ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Reverting $$p ; \
+ $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
+ else \
+ all_patches_ok=no ; \
+ fi ; \
+ done ; \
+ if ! test x$${all_patches_ok} == "xyes" ; then \
+ echo "WARNING Not all patches reverted cleanly" ; \
+ fi
+
stamps/overlay.stamp: stamps/patch.stamp
cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
@@ -1066,6 +1110,13 @@ jtregcheck: jtreg check-hotspot check-la
check-local: jtregcheck
+# fsg-tarball
+
+# Creates archive of openjdk that is compliant with Free Software guidelines.
+dist-openjdk-fsg: stamps/patch-fsg.stamp
+ $(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/
+
+
# Target Aliases
# ===============
@@ -1095,6 +1146,8 @@ patch-ecj: stamps/patch-ecj.stamp
patch: stamps/patch.stamp
+patch-fsg: stamps/patch-fsg.stamp
+
overlay: stamps/overlay.stamp
plugs: stamps/plugs.stamp
diff -r e81b34d95ce6 -r f6f00c3a9758 Makefile.in
--- a/Makefile.in Sun Jun 29 21:31:52 2008 +0200
+++ b/Makefile.in Sun Jun 29 21:42:50 2008 +0200
@@ -266,8 +266,8 @@ CACAO_VERSION = 0.99.1
CACAO_VERSION = 0.99.1
CACAO_MD5SUM = 2337754d0c165af556e97395e9a5e5af
JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
-EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
- gcjwebplugin.cc tools-copy contrib ports \
+EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_FSG_PATCHES) \
+ $(ICEDTEA_ECJ_PATCH) gcjwebplugin.cc tools-copy contrib ports \
patches/icedtea-gcc-4.3.patch extra $(ZERO_PATCHES) \
patches/icedtea-cacao.patch javaws.png javaws.desktop \
patches/icedtea-netx-plugin.patch \
@@ -420,13 +420,17 @@ NON_ZERO_PATCHES = \
# If Shark is required, apply shark patch
@SHARK_BUILD_TRUE at SHARK_PATCH = patches/icedtea-shark.patch
+ICEDTEA_FSG_PATCHES = \
+ patches/icedtea-license-headers.patch \
+ patches/icedtea-idl.patch \
+ patches/icedtea-jscheme.patch \
+ $(DISTRIBUTION_PATCHES)
+
ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-copy-plugs.patch patches/icedtea-version.patch \
patches/icedtea-text-relocations.patch \
patches/icedtea-graphics.patch patches/icedtea-debuginfo.patch \
- patches/icedtea-ssl.patch \
- patches/icedtea-license-headers.patch \
- patches/icedtea-webservices.patch \
+ patches/icedtea-ssl.patch patches/icedtea-webservices.patch \
patches/icedtea-netx-plugin.patch \
patches/icedtea-rmi_amd64.patch patches/icedtea-tools.patch \
patches/icedtea-demos.patch \
@@ -459,12 +463,13 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
- patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
+ patches/icedtea-no-bcopy.patch \
patches/icedtea-dnd-updatecursor.patch \
- patches/icedtea-component.patch patches/icedtea-idl.patch \
+ patches/icedtea-component.patch \
patches/icedtea-shark-build.patch \
- patches/icedtea-toolkit.patch $(SHARK_PATCH) $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES) $(am__append_7) $(am__append_8)
+ patches/icedtea-toolkit.patch \
+ patches/icedtea-jdk-docs-target.patch $(SHARK_PATCH) \
+ $(GCC_PATCH) $(am__append_7) $(am__append_8)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
@@ -901,7 +906,7 @@ clean-extract:
clean-extract:
rm -f stamps/extract.stamp
-stamps/patch.stamp: stamps/extract.stamp
+stamps/patch.stamp: stamps/patch-fsg.stamp
all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
@@ -927,6 +932,46 @@ clean-patch:
rm -f stamps/patch.stamp
all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
+ do \
+ echo Checking $$p ; \
+ if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Reverting $$p ; \
+ $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
+ else \
+ all_patches_ok=no ; \
+ fi ; \
+ done ; \
+ if ! test x$${all_patches_ok} == "xyes" ; then \
+ echo "WARNING Not all patches reverted cleanly" ; \
+ fi
+
+stamps/patch-fsg.stamp: stamps/extract.stamp
+ all_patches_ok=yes; \
+ for p in $(ICEDTEA_FSG_PATCHES) ; \
+ do \
+ if test x$${all_patches_ok} == "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
+ then \
+ echo Applying $$p ; \
+ $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
+ else \
+ test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
+ fi ; \
+ done ; \
+ mkdir -p stamps ; \
+ touch stamps/patch-fsg.stamp ; \
+ if ! test x$${all_patches_ok} == "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-patch before retrying a fix ; \
+ false; \
+ fi
+
+clean-patch-fsg:
+ rm -f stamps/patch-fsg.stamp
+ all_patches_ok=yes; \
+ for p in $(ICEDTEA_FSG_PATCHES) ; \
do \
echo Checking $$p ; \
if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
@@ -1483,6 +1528,12 @@ jtregcheck: jtreg check-hotspot check-la
check-local: jtregcheck
+# fsg-tarball
+
+# Creates archive of openjdk that is compliant with Free Software guidelines.
+dist-openjdk-fsg: stamps/patch-fsg.stamp
+ $(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/
+
# Target Aliases
# ===============
@@ -1511,6 +1562,8 @@ patch-ecj: stamps/patch-ecj.stamp
patch-ecj: stamps/patch-ecj.stamp
patch: stamps/patch.stamp
+
+patch-fsg: stamps/patch-fsg.stamp
overlay: stamps/overlay.stamp
diff -r e81b34d95ce6 -r f6f00c3a9758 aclocal.m4
--- a/aclocal.m4 Sun Jun 29 21:31:52 2008 +0200
+++ b/aclocal.m4 Sun Jun 29 21:42:50 2008 +0200
@@ -87,14 +87,16 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,9 +140,9 @@ if test $pkg_failed = yes; then
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff -r e81b34d95ce6 -r f6f00c3a9758 configure
--- a/configure Sun Jun 29 21:31:52 2008 +0200
+++ b/configure Sun Jun 29 21:42:50 2008 +0200
@@ -10380,10 +10380,11 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XPROTO" >&5
echo $ECHO_N "checking for XPROTO... $ECHO_C" >&6; }
-if test -n "$XPROTO_CFLAGS"; then
- pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XPROTO_CFLAGS"; then
+ pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
@@ -10393,13 +10394,15 @@ else
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
-fi
-if test -n "$XPROTO_LIBS"; then
- pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XPROTO_LIBS"; then
+ pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
@@ -10409,8 +10412,9 @@ else
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -10423,9 +10427,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto" 2>&1`
+ XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
else
- XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto" 2>&1`
+ XPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XPROTO_PKG_ERRORS" >&5
@@ -10458,10 +10462,11 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XT" >&5
echo $ECHO_N "checking for XT... $ECHO_C" >&6; }
-if test -n "$XT_CFLAGS"; then
- pkg_cv_XT_CFLAGS="$XT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XT_CFLAGS"; then
+ pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@ -10471,13 +10476,15 @@ else
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
-fi
-if test -n "$XT_LIBS"; then
- pkg_cv_XT_LIBS="$XT_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XT_LIBS"; then
+ pkg_cv_XT_LIBS="$XT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@ -10487,8 +10494,9 @@ else
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -10501,9 +10509,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
+ XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
else
- XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
+ XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XT_PKG_ERRORS" >&5
@@ -10536,10 +10544,11 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XP" >&5
echo $ECHO_N "checking for XP... $ECHO_C" >&6; }
-if test -n "$XP_CFLAGS"; then
- pkg_cv_XP_CFLAGS="$XP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XP_CFLAGS"; then
+ pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
($PKG_CONFIG --exists --print-errors "xp") 2>&5
ac_status=$?
@@ -10549,13 +10558,15 @@ else
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
-fi
-if test -n "$XP_LIBS"; then
More information about the distro-pkg-dev
mailing list