/hg/icedtea6-hg: 29 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 7 14:36:06 PDT 2010
changeset 507d3308f9c9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=507d3308f9c9
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 22 18:15:40 2010 +0100
Fix use of non-existent ICEDTEA_DEBUG_BUILD_DIR.
2010-06-22 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Replace ICEDTEA_DEBUG_BUILD_DIR with
DEBUG_BUILD_OUTPUT_DIR.
changeset 038bfe38cab1 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=038bfe38cab1
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 22 19:10:30 2010 +0100
Remove linking of non-existent platform_zero.in
2010-06-22 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (ports.stamp): Remove unneeded
linking of platform_zero (no longer exists).
changeset da2ba8396450 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=da2ba8396450
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 22 19:14:32 2010 +0100
S6961732: FontMetrics.getLeading() may be negative in freetype-based
OpenJDK builds
2010-06-22 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* patches/openjdk/6961732.patch: Backport of 6961732:
FontMetrics.getLeading() may be negative in freetype-based
OpenJDK builds
changeset a4bc545c483a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a4bc545c483a
author: doko at ubuntu.com
date: Thu Jun 24 00:56:40 2010 +0200
Update CACAO to 1.1.0pre (mostly backports from icedtea7).
Builds, not yet tested otherwise.
2010-06-24 Andrew John Hughes <ahughes at redhat.com>
Matthias Klose <doko at ubuntu.com>
* patches/cacao/no-strict-aliasing.patch: Remove, applied
upstream.
* patches/icedtea-cacao-no-mmap-first-page.patch: Likewise.
* patches/icedtea-cacao.patch: Remove, replaced by ...
* patches/cacao/launcher.patch: New.
* patches/cacao/memory.patch: Increase the memory used in the
langtools build when using CACAO.
* patches/cacao/arm-arch-defines.patch: Update.
* patches/cacao/6714758.patch: Add JVM_FindClassFromBootLoader
introduced by 6714758 and modified in 6864003.
http://server.complang.tuwien.ac.at/cgi-
bin/bugzilla/show_bug.cgi?id=137
* patches/icedtea-cacao-ignore-tests.patch: Remove, replaced by ...
* patches/cacao/ignore-tests.patch: New.
* patches/cacao/jsig.patch: Update.
* patches/cacao/package-version.diff: Drop 'preX' from the cacao
package version.
* patches/cacao/version.patch: Update
* Makefile.am (ICEDTEA_PATCHES): Add/remove patches. Use
Mercurial snapshot of CACAO 1.1.0pre.
changeset c09ec1d01ca3 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c09ec1d01ca3
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 24 09:40:43 2010 -0400
netx: handle JNLP files which use native libraries but do not
indiate it
2010-06-24 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/SecurityDesc.java: Fix comments.
* netx/net/sourceforge/jnlp/JNLPClassLoader.java (activateJars):
Always call activateNative. (activateNative): Search for native
code anywhere in the jar.
changeset 5ecaa9185c34 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5ecaa9185c34
author: doko at ubuntu.com
date: Thu Jun 24 16:02:09 2010 +0200
Fix build --with-addition-vms=cacao
2010-06-24 Matthias Klose <doko at ubuntu.com>
* Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-
debug.stamp): Update libjsig.so installation location.
changeset f40f87b95dc0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f40f87b95dc0
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 24 18:44:12 2010 +0100
Fix broken CACAO build and remove redundant patches.
2010-06-24 Andrew John Hughes <ahughes at redhat.com>
* patches/cacao/6714758.patch: Removed, 6714758 is
not in OpenJDK6.
* patches/cacao/package-version.diff: Removed; we shouldn't be
altering the CACAO version and it builds without this fix.
* patches/cacao/version.patch: Dropped; only needed for 7.
* patches/icedtea-cacao-ignore-jdi-tests.patch: Moved to...
* Makefile.am: Drop unneeded patches. Remove non-existent
nio2 reference. Fix path to ignore-jdi-tests.patch.
(CACAO_BASE_URL): Shorten to just the base. (CACAO_SRC_ZIP):
Use version from IcedTea7. (download-cacao): Added from
IcedTea7. (clean-download-cacao): Likewise.
(download): Depend on download-cacao. Remove CACAO
downloading. (clean-download): Depend on clean-download-
cacao. Remove CACAO cleaning.
* patches/cacao/ignore-jdi-tests.patch: ...here.
changeset 1c22941d9896 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1c22941d9896
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 24 21:30:07 2010 +0100
Bump changeset to a CACAO build using -O2 and include a fix for a
version parsing bug.
2010-06-24 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch and update:
(CACAO_VERSION): Bump to changeset which increases
optimisation to -O2 not -O0. (CACAO_SHA256SUM): Updated for
above.
* patches/cacao/version-parsing.patch: Fix parsing of the
minor version due to the update from 1.1.0pre to 1.1.0pre1
in the new changeset.
changeset 2abd775a9d46 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2abd775a9d46
author: doko at ubuntu.com
date: Fri Jun 25 12:24:35 2010 +0200
2010-06-25 Matthias Klose <doko at ubuntu.com>
Fix shark build failures, update for latest HotSpot taken
from
http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Update.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Update.
* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Update.
changeset fa1c6854f1e6 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fa1c6854f1e6
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 28 14:18:16 2010 +0100
Drop VisualVM, now maintained independently of IcedTea.
2010-06-25 Andrew John Hughes <ahughes at redhat.com>
Remove VisualVM support, now maintained at
http://icedtea.classpath.org/hg/visualvm
* Makefile.am: Remove VisualVM targets, references and
aliases. (NETBEANS_PROFILER_URL): Removed.
(NETBEANS_PROFILER_SRC_ZIP): Likewise.
(NETBEANS_PROFILER_MD5SUM): Likewise. (VISUALVM_URL):
Likewise. (VISUALVM_SRC_ZIP): Likewise.
(VISUALVM_MD5SUM): Likewise. (EXTRA_DIST): Remove
visualvm.desktop. (distclean-local): Remove visualvm and
netbeans deletion. (.PHONY): Remove clean-visualvm and
clean-nbplatform targets. (download): Don't download
VisualVM. (clean-download): Don't remove the VisualVM and
NetBeans zips. (extract): Don't extract VisualVM and
NetBeans. (icedtea): Don't depend on visualvm.stamp and
remove post-install measures. (icedtea-debug):
Likewise. (nbplatform): Removed. (visualvm):
Removed.
* acinclude.m4: Remove VisualVM-related macros.
(FIND_NETBEANS): Removed.
* configure.ac: Remove --with-netbeans-home and
--enable-visualvm options. Don't invoke VisualVM macros.
* visualvm.desktop: Removed.
changeset b434625f3fd8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b434625f3fd8
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 30 00:47:55 2010 +0100
Fix debug build by ensuring specified output directory is used as
intended.
2010-06-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (ICEDTEA_DEBUG_BUILD_TARGET): Don't
add debug suffix, OpenJDK makefile already does this.
* patches/debug-dir.patch: Fix OpenJDK Makefile to just add
the debug suffix and not move it to ../$(OS)-$(ARCH)-debug.
changeset 4fbf7302ddbe in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4fbf7302ddbe
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 30 00:53:06 2010 +0100
Avoid passing --sync to df in the OpenJDK sanity check.
2010-06-29 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* patches/no-sync.patch: Don't pass --sync to df; the file
space check does not need to be so accurate that we have to
flush all buffers to disc.
changeset 616766de2cfe in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=616766de2cfe
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 30 22:03:22 2010 +0100
PR icedtea/93: Provide a proper clean target not aliased to
distclean that calls all dependent clean targets.
2010-06-30 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/93
* Makefile.am: Fix cleanup process. (clean-local): Renamed
from distclean-local. Add additional dependent clean
targets. Don't remove build directories and stamps;
should be done by dependents. (.PHONY): Updated.
(clean-ports): Inverse of ports.stamp. (clean-overlay):
Inverse of overlay.stamp. (clean-native-ecj): Inverse of
native-ecj.stamp. (clean-icedtea): Just delete the build
directory and stamp. (clean-icedtea-debug): Inverse of
icedtea-debug.stamp. (clean-icedtea-against-icedtea):
Inverse of icedtea-against-icedtea.stamp (clean-icedtea-
debug-against-icedtea): Inverse of icedtea-debug-against-
icedtea.stamp (clean-icedtea-ecj): Just delete the build
directory and stamp. (clean-icedtea-against-ecj): Inverse of
icedtea-against-ecj.stamp. (clean-IcedTeaPlugin): Delete
empty build directories if srcdir != builddir. (clean-pulse-
java): Likewise. (clean-add-cacao): Inverse of add-
cacao.stamp. (clean-add-cacao-debug): Inverse of add-cacao-
debug.stamp. (clean-add-zero): Inverse of add-zero.stamp.
(clean-add-zero-debug): Inverse of add-zero-debug.stamp.
(clean): Removed; already provided by autoconf to point to clean-
local.
changeset ffd5f9e8887d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ffd5f9e8887d
author: Omair Majid <omajid at redhat.com>
date: Tue Jun 29 14:19:38 2010 -0400
Netx: make path sanitization consistent; use a blacklisting
approach.
2010-06-29 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/cache/CacheUtil.java
(urlToPath): Call FileUtils.sanitizePath. (fixPath): Moved to...
* netx/net/sourceforge/jnlp/util/FileUtils.java (sanitizePath):
New function. Moved from CacheUtil.java (sanitizeFileName): Use
a blacklisting approach rather than a whitelisting approach:
should work better with non ascii filenames.
changeset e7c3958eee03 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e7c3958eee03
author: Omair Majid <omajid at redhat.com>
date: Tue Jun 29 14:26:57 2010 -0400
Netx: make the SingleInstanceServer thread a daemon thread
2010-06-29 Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/services/XSingleInstanceService.java
(startListeningServer): Mark the thread as a daemon so the JVM can
shutdown if there are no other non-daemon thread running.
changeset fc215b8f9b18 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fc215b8f9b18
author: Omair Majid <omajid at redhat.com>
date: Tue Jun 29 15:48:10 2010 -0400
Netx: allow jnlp classloaders to share native libraries 2010-06-29
Omair Majid <omajid at redhat.com>
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
nativeDirectories: New variable. Contains a list of directories that
contain native libraries. (getInstance): Tell other classloaders
about the native directory. (getNativeDir): Add the new native
directory to nativeDirectories. (addNativeDirectory): New
function. (getNativeDirectories): New function.
(findLibrary): Look in all the native directories for the native
library.
changeset 7649271c60ab in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7649271c60ab
author: Omair Majid <omajid at redhat.com>
date: Wed Jun 30 19:15:49 2010 -0400
Merge
changeset e6ef1847ac70 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e6ef1847ac70
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 01 23:13:01 2010 +0100
Fix extraction cleanup.
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Add clean-extract (in
place of clean-cacao, a dependent), clean-extract-ecj,
clean-generated and clean-replace-hotspot. Don't delete
openjdk and openjdk-ecj here, now done in dependents.
(extract): Depend on extract-cacao.stamp. (clean-extract):
Depend on clean-extract-openjdk and clean-cacao.
(clean-extract-openjdk): Remove openjdk directory and stamp.
(extract-openjdk): Just extract OpenJDK, don't extract cacao
and create generated. (replace-hotspot): Make sure stamps
exists. (clean-replace-hotspot): No need for recursive
delete. (generated): Copy generated directory from srcdir if
needed. (clean-generated): Remove generated directory if
necessary. (patch-fsg): Depend on generated rather than
ports so it is included. (clean-icedtea-ecj): Remove bogus
dependency.
changeset 15fb1bdc42b3 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=15fb1bdc42b3
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 01 23:31:12 2010 +0100
Check directories exist before using rmdir.
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-IcedTeaPlugin): Check
directory exists before using rmdir. (clean-pulse-
java): Likewise.
changeset aafcd75154a1 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aafcd75154a1
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 01 23:41:42 2010 +0100
Handle cleaning of downloads via make distclean.
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (distclean-local): Added. Removes
downloads in addition to other cleaning targets.
(.PHONY): Updated. (download-openjdk): Separate OpenJDK
download into separate target. (clean-download-
openjdk): Inversion of download-openjdk. (download):
Metatarget for all downloads. (clean-download): Metatarget
for all download cleaning. (clean-cacao): Remove extraction
stamp.
changeset 9ac98799e75d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9ac98799e75d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 02 10:31:36 2010 +0100
Don't delete alternate zip bundles, only those we download.
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
Don't delete alternate source zips. Only zips
downloaded by the build should be deleted.
* Makefile.am: (HOTSPOT_SRC_ZIP): Set as a constant value
rather than setting to ALT_HOTSPOT_SRC_ZIP when available.
(OPENJDK_SRC_ZIP): Likewise, though the value is still empty
when using hg. (download-openjdk): Symlink the alternate
OpenJDK and HotSpot source zips to the alternate versions.
(clean-download-openjdk): Remvoe HOTSPOT_SRC_ZIP as well.
changeset 12239904d147 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=12239904d147
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 02 10:35:35 2010 +0100
Delete empty tapset directory if srcdir != builddir.
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (distclean-local): Delete empty
tapset directory if srcdir != builddir.
changeset 40f04e0a5018 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=40f04e0a5018
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 02 16:09:15 2010 +0100
Make sure download-openjdk creates the right stamp.
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (download-openjdk): Create download-
openjdk.stamp, not download.stamp.
changeset 4b85abd38b4c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4b85abd38b4c
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 02 17:26:42 2010 +0100
Make sure generated target creates generated.stamp.
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (generated): Make sure
generated.stamp is created.
changeset c46acd86bc92 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c46acd86bc92
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 05 00:00:58 2010 +0100
Add remaining missing clean-local dependencies so that build tree is
completely empty after make distclean.
2010-07-04 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Add missing
dependencies. Use rmdir to remove bootstrap and lib to make
sure they are empty. Use rmdir to remove the empty stamps
directory. (clean-extract-openjdk): Depend on clean-patch-
fsg. (clean-patch-fsg): Depend on clean-patch.
(clean-extract-ecj): Depend on clean-patch-ecj. (rewriter):
Give the build directory a different name to the source
directory (rewriter.build). (clean-rewriter): New target to
remove rewriter. (rewrite-rhino): Fix build directory path.
(clean-rewrite-rhino): Inverse of rewrite-rhino. (rt): Only
replace rt.jar if the bootstrap tree still exists.
changeset 0e8960d7a100 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0e8960d7a100
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 05 11:58:04 2010 +0100
Remove the stamps directory on distclean, not clean.
2010-07-05 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Don't remove the
stamps directory here. (distclean-local): Remove it here.
changeset 5c61be3119bb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5c61be3119bb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 05 17:31:35 2010 +0100
Only manipulate rt.jar's contents when LACKS_SUN_AWT_TOOLKIT is
defined. Clarify variable names.
2010-07-05 Andrew John Hughes <ahughes at redhat.com>
Revert rt.jar only for ecj tree. Don't do so (or
build rt-class-files) for builds with OpenJDK. Make
variable naming clearer.
* Makefile.am: (BOOT_DIR): Renamed from ICEDTEA_BOOT_DIR.
(RUNTIME): Renamed from ICEDTEA_RT. (ENDORSED_DIR): Renamed
from ICEDTEA_ENDORSED_DIR. (ECJ_BOOT_DIR): Shortcut for
bootstrap/ecj. (ICEDTEA_BOOT_DIR): Shortcut for
bootstrap/icedtea. (rt-class-files): Only build replacement
runtime classes when LACKS_SUN_AWT_TOOLKIT is set.
(clean-rt): Only replace rt.jar when LACKS_SUN_AWT_TOOLKIT
and overwrite in $(ECJ_BOOT_DIR) not $(BOOT_DIR).
changeset aecac87c5af7 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aecac87c5af7
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jul 06 18:46:18 2010 +0100
Simplify naming of the pulse-java build directory and include the
jar file in the pulse java build tree.
2010-07-06 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (PULSE_JAVA_BUILDDIR): Use a
different name from the source directory to avoid confusion.
(clean-local): jni-common.o is not in the top-level
directory. (icedtea): Locate pulse-java.jar in build
directory not top-level directory. (icedtea-debug):
Likewise. (pulse-java-jar): Likewise. (clean-pulse-
java): Likewise. Given clean-pulse-java only exists when
PULSE_JAVA_NATIVE_BUILDDIR and PULSE_JAVA_CLASS_DIR are set,
there is no need to test them.
changeset 09bbaad21267 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=09bbaad21267
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 07 22:35:59 2010 +0100
S6961732: Remove patch; applied upstream.
2010-07-07 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/6961732.patch: Dropped, applied
upstream.
* Makefile.am: Remove above patch.
diffstat:
28 files changed, 2435 insertions(+), 2178 deletions(-)
ChangeLog | 349 ++
Makefile.am | 701 ++--
acinclude.m4 | 32
configure.ac | 31
netx/net/sourceforge/jnlp/SecurityDesc.java | 9
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 17
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 93
netx/net/sourceforge/jnlp/services/XSingleInstanceService.java | 11
netx/net/sourceforge/jnlp/util/FileUtils.java | 51
patches/cacao/arm-arch-defines.patch | 14
patches/cacao/ignore-jdi-tests.patch | 1496 ++++++++++
patches/cacao/ignore-tests.patch | 11
patches/cacao/jsig.patch | 18
patches/cacao/launcher.patch | 50
patches/cacao/memory.patch | 18
patches/cacao/nio2.patch | 41
patches/cacao/no-strict-aliasing.patch | 22
patches/cacao/version-parsing.patch | 11
patches/debug-dir.patch | 31
patches/icedtea-cacao-ignore-jdi-tests.patch | 1496 ----------
patches/icedtea-cacao-ignore-tests.patch | 10
patches/icedtea-cacao-no-mmap-first-page.patch | 23
patches/icedtea-cacao.patch | 50
patches/no-sync.patch | 14
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 1
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 2
ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 2
visualvm.desktop | 9
diffs (truncated from 5542 to 500 lines):
diff -r 946a062e9027 -r 09bbaad21267 ChangeLog
--- a/ChangeLog Tue Jun 22 16:55:55 2010 +0100
+++ b/ChangeLog Wed Jul 07 22:35:59 2010 +0100
@@ -1,3 +1,352 @@ 2010-06-22 Andrew John Hughes <ahughes
+2010-07-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6961732.patch:
+ Dropped, applied upstream.
+ * Makefile.am: Remove above patch.
+
+2010-07-06 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (PULSE_JAVA_BUILDDIR): Use a different name from
+ the source directory to avoid confusion.
+ (clean-local): jni-common.o is not in the top-level
+ directory.
+ (icedtea): Locate pulse-java.jar in build directory
+ not top-level directory.
+ (icedtea-debug): Likewise.
+ (pulse-java-jar): Likewise.
+ (clean-pulse-java): Likewise. Given clean-pulse-java
+ only exists when PULSE_JAVA_NATIVE_BUILDDIR and
+ PULSE_JAVA_CLASS_DIR are set, there is no need to test
+ them.
+
+2010-07-05 Andrew John Hughes <ahughes at redhat.com>
+
+ Revert rt.jar only for ecj tree. Don't do
+ so (or build rt-class-files) for builds with
+ OpenJDK. Make variable naming clearer.
+ * Makefile.am:
+ (BOOT_DIR): Renamed from ICEDTEA_BOOT_DIR.
+ (RUNTIME): Renamed from ICEDTEA_RT.
+ (ENDORSED_DIR): Renamed from ICEDTEA_ENDORSED_DIR.
+ (ECJ_BOOT_DIR): Shortcut for bootstrap/ecj.
+ (ICEDTEA_BOOT_DIR): Shortcut for bootstrap/icedtea.
+ (rt-class-files): Only build replacement runtime classes
+ when LACKS_SUN_AWT_TOOLKIT is set.
+ (clean-rt): Only replace rt.jar when LACKS_SUN_AWT_TOOLKIT
+ and overwrite in $(ECJ_BOOT_DIR) not $(BOOT_DIR).
+
+2010-07-05 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Don't remove the stamps directory here.
+ (distclean-local): Remove it here.
+
+2010-07-04 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Add missing dependencies.
+ Use rmdir to remove bootstrap and lib to make
+ sure they are empty. Use rmdir to remove the
+ empty stamps directory.
+ (clean-extract-openjdk): Depend on clean-patch-fsg.
+ (clean-patch-fsg): Depend on clean-patch.
+ (clean-extract-ecj): Depend on clean-patch-ecj.
+ (rewriter): Give the build directory a different
+ name to the source directory (rewriter.build).
+ (clean-rewriter): New target to remove rewriter.
+ (rewrite-rhino): Fix build directory path.
+ (clean-rewrite-rhino): Inverse of rewrite-rhino.
+ (rt): Only replace rt.jar if the bootstrap tree
+ still exists.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (generated): Make sure generated.stamp is
+ created.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (download-openjdk): Create download-openjdk.stamp,
+ not download.stamp.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (distclean-local): Delete empty tapset
+ directory if srcdir != builddir.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ Don't delete alternate source zips. Only
+ zips downloaded by the build should be deleted.
+ * Makefile.am:
+ (HOTSPOT_SRC_ZIP): Set as a constant value
+ rather than setting to ALT_HOTSPOT_SRC_ZIP
+ when available.
+ (OPENJDK_SRC_ZIP): Likewise, though the value
+ is still empty when using hg.
+ (download-openjdk): Symlink the alternate
+ OpenJDK and HotSpot source zips to the
+ alternate versions.
+ (clean-download-openjdk): Remvoe
+ HOTSPOT_SRC_ZIP as well.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (distclean-local): Added. Removes downloads
+ in addition to other cleaning targets.
+ (.PHONY): Updated.
+ (download-openjdk): Separate OpenJDK download
+ into separate target.
+ (clean-download-openjdk): Inversion of download-openjdk.
+ (download): Metatarget for all downloads.
+ (clean-download): Metatarget for all download cleaning.
+ (clean-cacao): Remove extraction stamp.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-IcedTeaPlugin): Check directory exists before
+ using rmdir.
+ (clean-pulse-java): Likewise.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Add clean-extract (in place
+ of clean-cacao, a dependent), clean-extract-ecj,
+ clean-generated and clean-replace-hotspot.
+ Don't delete openjdk and openjdk-ecj here, now
+ done in dependents.
+ (extract): Depend on extract-cacao.stamp.
+ (clean-extract): Depend on clean-extract-openjdk
+ and clean-cacao.
+ (clean-extract-openjdk): Remove openjdk directory and stamp.
+ (extract-openjdk): Just extract OpenJDK, don't
+ extract cacao and create generated.
+ (replace-hotspot): Make sure stamps exists.
+ (clean-replace-hotspot): No need for recursive delete.
+ (generated): Copy generated directory from srcdir if needed.
+ (clean-generated): Remove generated directory if necessary.
+ (patch-fsg): Depend on generated rather than ports so it is included.
+ (clean-icedtea-ecj): Remove bogus dependency.
+
+2010-06-30 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ nativeDirectories: New variable. Contains a list of directories that
+ contain native libraries.
+ (getInstance): Tell other classloaders about the native directory.
+ (getNativeDir): Add the new native directory to nativeDirectories.
+ (addNativeDirectory): New function.
+ (getNativeDirectories): New function.
+ (findLibrary): Look in all the native directories for the native library.
+
+2010-06-30 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/services/XSingleInstanceService.java
+ (startListeningServer): Mark the thread as a daemon so the JVM can
+ shutdown if there are no other non-daemon thread running.
+
+2010-06-30 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java
+ (urlToPath): Call FileUtils.sanitizePath.
+ (fixPath): Moved to...
+ * netx/net/sourceforge/jnlp/util/FileUtils.java
+ (sanitizePath): New function. Moved from CacheUtil.java
+ (sanitizeFileName): Use a blacklisting approach rather than a whitelisting
+ approach: should work better with non ascii filenames.
+
+2010-06-30 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/93
+ * Makefile.am: Fix cleanup process.
+ (clean-local): Renamed from distclean-local.
+ Add additional dependent clean targets.
+ Don't remove build directories and stamps;
+ should be done by dependents.
+ (.PHONY): Updated.
+ (clean-ports): Inverse of ports.stamp.
+ (clean-overlay): Inverse of overlay.stamp.
+ (clean-native-ecj): Inverse of native-ecj.stamp.
+ (clean-icedtea): Just delete the build directory and stamp.
+ (clean-icedtea-debug): Inverse of icedtea-debug.stamp.
+ (clean-icedtea-against-icedtea): Inverse of icedtea-against-icedtea.stamp
+ (clean-icedtea-debug-against-icedtea): Inverse of icedtea-debug-against-icedtea.stamp
+ (clean-icedtea-ecj): Just delete the build directory and stamp.
+ (clean-icedtea-against-ecj): Inverse of icedtea-against-ecj.stamp.
+ (clean-IcedTeaPlugin): Delete empty build directories if srcdir != builddir.
+ (clean-pulse-java): Likewise.
+ (clean-add-cacao): Inverse of add-cacao.stamp.
+ (clean-add-cacao-debug): Inverse of add-cacao-debug.stamp.
+ (clean-add-zero): Inverse of add-zero.stamp.
+ (clean-add-zero-debug): Inverse of add-zero-debug.stamp.
+ (clean): Removed; already provided by autoconf to point to clean-local.
+
+2010-06-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/no-sync.patch: Don't pass --sync
+ to df; the file space check does not need
+ to be so accurate that we have to flush all
+ buffers to disc.
+
+2010-06-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_DEBUG_BUILD_TARGET): Don't add
+ debug suffix, OpenJDK makefile already does this.
+ * patches/debug-dir.patch: Fix OpenJDK
+ Makefile to just add the debug suffix and
+ not move it to ../$(OS)-$(ARCH)-debug.
+
+2010-06-25 Andrew John Hughes <ahughes at redhat.com>
+
+ Remove VisualVM support, now maintained at
+ http://icedtea.classpath.org/hg/visualvm
+ * Makefile.am:
+ Remove VisualVM targets, references and aliases.
+ (NETBEANS_PROFILER_URL): Removed.
+ (NETBEANS_PROFILER_SRC_ZIP): Likewise.
+ (NETBEANS_PROFILER_MD5SUM): Likewise.
+ (VISUALVM_URL): Likewise.
+ (VISUALVM_SRC_ZIP): Likewise.
+ (VISUALVM_MD5SUM): Likewise.
+ (EXTRA_DIST): Remove visualvm.desktop.
+ (distclean-local): Remove visualvm and netbeans deletion.
+ (.PHONY): Remove clean-visualvm and clean-nbplatform targets.
+ (download): Don't download VisualVM.
+ (clean-download): Don't remove the VisualVM and NetBeans zips.
+ (extract): Don't extract VisualVM and NetBeans.
+ (icedtea): Don't depend on visualvm.stamp and remove post-install
+ measures.
+ (icedtea-debug): Likewise.
+ (nbplatform): Removed.
+ (visualvm): Removed.
+ * acinclude.m4:
+ Remove VisualVM-related macros.
+ (FIND_NETBEANS): Removed.
+ * configure.ac:
+ Remove --with-netbeans-home and
+ --enable-visualvm options. Don't invoke
+ VisualVM macros.
+ * visualvm.desktop: Removed.
+
+2010-06-25 Matthias Klose <doko at ubuntu.com>
+
+ Fix shark build failures, update for latest HotSpot taken from
+ http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Update.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Update.
+ * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Update.
+
+2010-06-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Add new patch and update:
+ (CACAO_VERSION): Bump to changeset which
+ increases optimisation to -O2 not -O0.
+ (CACAO_SHA256SUM): Updated for above.
+ * patches/cacao/version-parsing.patch:
+ Fix parsing of the minor version due to
+ the update from 1.1.0pre to 1.1.0pre1 in
+ the new changeset.
+
+2010-06-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/cacao/6714758.patch:
+ Removed, 6714758 is not in OpenJDK6.
+ * patches/cacao/package-version.diff:
+ Removed; we shouldn't be altering the CACAO
+ version and it builds without this fix.
+ * patches/cacao/version.patch:
+ Dropped; only needed for 7.
+ * patches/icedtea-cacao-ignore-jdi-tests.patch:
+ Moved to...
+ * Makefile.am:
+ Drop unneeded patches. Remove non-existent nio2
+ reference. Fix path to ignore-jdi-tests.patch.
+ (CACAO_BASE_URL): Shorten to just the base.
+ (CACAO_SRC_ZIP): Use version from IcedTea7.
+ (download-cacao): Added from IcedTea7.
+ (clean-download-cacao): Likewise.
+ (download): Depend on download-cacao.
+ Remove CACAO downloading.
+ (clean-download): Depend on clean-download-cacao.
+ Remove CACAO cleaning.
+ * patches/cacao/ignore-jdi-tests.patch: ...here.
+
+2010-06-24 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp):
+ Update libjsig.so installation location.
+
+2010-06-24 Omair Majid <omajid at redhat.com>
+
+ * netx/net/sourceforge/jnlp/SecurityDesc.java: Fix comments.
+ * netx/net/sourceforge/jnlp/JNLPClassLoader.java
+ (activateJars): Always call activateNative.
+ (activateNative): Search for native code anywhere in the jar.
+
+2010-06-24 Andrew John Hughes <ahughes at redhat.com>
+ Matthias Klose <doko at ubuntu.com>
+
+ * patches/cacao/no-strict-aliasing.patch: Remove, applied upstream.
+ * patches/icedtea-cacao-no-mmap-first-page.patch: Likewise.
+ * patches/icedtea-cacao.patch: Remove, replaced by ...
+ * patches/cacao/launcher.patch: New.
+ * patches/cacao/memory.patch: Increase the memory used in the langtools
+ build when using CACAO.
+ * patches/cacao/arm-arch-defines.patch: Update.
+ * patches/cacao/6714758.patch: Add JVM_FindClassFromBootLoader
+ introduced by 6714758 and modified in 6864003.
+ http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=137
+ * patches/icedtea-cacao-ignore-tests.patch: Remove, replaced by ...
+ * patches/cacao/ignore-tests.patch: New.
+ * patches/cacao/jsig.patch: Update.
+ * patches/cacao/package-version.diff: Drop 'preX' from the cacao
+ package version.
+ * patches/cacao/version.patch: Update
+ * Makefile.am (ICEDTEA_PATCHES): Add/remove patches.
+ Use Mercurial snapshot of CACAO 1.1.0pre.
+
+2010-05-11 Andrew John Hughes <ahughes at redhat.com>
+
+ Fix issues with the CACAO build so it at
+ least builds again (though it still fails to
+ bootstrap).
+ * Makefile.am: Add new patches.
+ * patches/cacao/6714758.patch:
+ Add JVM_FindClassFromBootLoader introduced by
+ 6714758 and modified in 6864003.
+ http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=137
+ * patches/cacao/jsig.patch:
+ Place fake libjsig.so in correct location for HotSpot 17+.
+
+2010-06-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/openjdk/6961732.patch:
+ Backport of 6961732: FontMetrics.getLeading()
+ may be negative in freetype-based OpenJDK builds
+
+2010-06-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (ports.stamp): Remove unneeded linking of
+ platform_zero (no longer exists).
+
+2010-06-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Replace ICEDTEA_DEBUG_BUILD_DIR with
+ DEBUG_BUILD_OUTPUT_DIR.
+
2010-06-22 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 946a062e9027 -r 09bbaad21267 Makefile.am
--- a/Makefile.am Tue Jun 22 16:55:55 2010 +0100
+++ b/Makefile.am Wed Jul 07 22:35:59 2010 +0100
@@ -5,18 +5,11 @@ OPENJDK_VERSION = b20
OPENJDK_VERSION = b20
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
-CACAO_VERSION = 0.99.4
-CACAO_MD5SUM = c5e6525c5212ddbb6026e4a7cde37ca6
-CACAO_BASE_URL = http://www.complang.tuwien.ac.at
-CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
-
-NETBEANS_PROFILER_MD5SUM = 40dd3183b345737ca22162d164c2d5a2
-NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/149581/
-NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68.tar.gz
-
-VISUALVM_MD5SUM = f1e2525ddcd5fdf97bcf891d715c08ff
-VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/146746/
-VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz
+CACAO_VERSION = dd4532afd08a
+CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4
+CACAO_BASE_URL = http://mips.complang.tuwien.ac.at
+CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150724
JAXWS_DROP_ZIP = jdk6-jaxws-b20.zip
@@ -30,6 +23,8 @@ JAXP_DROP_SHA256SUM = d097627d4059d488c5
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
+HOTSPOT_SRC_ZIP = hotspot.tar.gz
+
# Build directories
BUILD_DIR = openjdk.build
@@ -38,12 +33,11 @@ ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DI
ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-ecj
ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
-ICEDTEA_BOOT_DIR= \
- $(abs_top_builddir)/bootstrap/jdk1.6.0
-ICEDTEA_RT = \
- $(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
-ICEDTEA_ENDORSED_DIR = \
- $(ICEDTEA_BOOT_DIR)/lib/endorsed
+BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
+RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
+ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
+ECJ_BOOT_DIR = $(abs_top_builddir)/bootstrap/ecj
+ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -99,8 +93,6 @@ ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/management/StandardMBean.java \
$(NETX_BOOTSTRAP_CLASSES)
-# FIXME (javac): Settings for javac go here
-
# Flags
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
@@ -113,27 +105,7 @@ if USE_HG
if USE_HG
OPENJDK_SRC_ZIP =
else
-if USE_ALT_OPENJDK_SRC_ZIP
- OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
-else
OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
-endif
-endif
-
-if USE_ALT_HOTSPOT_SRC_ZIP
- HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP)
-else
- HOTSPOT_SRC_ZIP = hotspot.tar.gz
-endif
-
-if USE_ALT_CACAO_SRC_ZIP
- CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
-else
-if USE_ALT_CACAO_SRC_DIR
- CACAO_SRC_ZIP = "not needed"
-else
- CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-endif
endif
# FIXME (HotSpot): HotSpot changeset logic goes here
@@ -148,18 +120,12 @@ ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/Ice
stamps/liveconnect-dist.stamp
endif
-if WITH_VISUALVM
-NB_PLATFORM= $(shell ls /usr/share/netbeans | grep platform | tail -n1)
-else
-NB_PLATFORM=
-endif
-
if ENABLE_PULSE_JAVA
# include the makefile in pulseaudio subdir
PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
-PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio
+PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio.build
PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
PULSE_JAVA_NATIVE_OBJECTS = \
$(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
@@ -178,12 +144,11 @@ else
MEMORY_LIMIT =
endif
-ICEDTEA_DEBUG_BUILD_TARGET=ALT_OUTPUTDIR="$(ICEDTEA_DEBUG_BUILD_DIR)"
if WITH_CACAO
- ICEDTEA_BUILD_TARGET=j2se_only
- ICEDTEA_DEBUG_BUILD_TARGET += j2se_fastdebug_only
+ ICEDTEA_BUILD_TARGET=jdk_only
+ ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
else
- ICEDTEA_DEBUG_BUILD_TARGET += debug_build
+ ICEDTEA_DEBUG_BUILD_TARGET = debug_build
endif
# FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap
@@ -195,7 +160,7 @@ else
else
BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
SYSTEM_JDK_DIR = $(SYSTEM_GCJ_DIR)
- ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
+ ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR)
INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
endif
@@ -311,7 +276,9 @@ ICEDTEA_PATCHES = \
patches/extensions/netx-umask.patch \
patches/icedtea-jtreg-httpTest.patch \
patches/arm.patch \
- patches/shark-debug-option.patch
+ patches/shark-debug-option.patch \
+ patches/debug-dir.patch \
+ patches/no-sync.patch
More information about the distro-pkg-dev
mailing list