/hg/icedtea6: 3 new changesets
mjw at icedtea.classpath.org
mjw at icedtea.classpath.org
Fri Aug 17 07:39:01 PDT 2012
changeset 3f73297b2b13 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3f73297b2b13
author: Mark Wielaard <mark at klomp.org>
date: Thu Aug 16 22:02:19 2012 +0200
add-nss.stamp: Only try patching the security files if they actually exist.
changeset ce869b71eca1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ce869b71eca1
author: Mark Wielaard <mark at klomp.org>
date: Thu Aug 16 22:13:13 2012 +0200
Setup drops directory by symlinking when building zerovm.
We are not actually using the drops inside the zerovm build environment,
but they are checked. Which would lead to extra downloading.
* Makefile.am (add-zero.stamp): Setup drops directory by symlinking.
(add-zero-debug.stamp): Likewise.
changeset 34390e3aa8c5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=34390e3aa8c5
author: Mark Wielaard <mark at klomp.org>
date: Fri Aug 17 16:32:32 2012 +0200
merge
diffstat:
ChangeLog | 15 +++++++++
Makefile.am | 74 +++++++++++++++++++++++++---------------------
patches/ecj/icedtea.patch | 5 ++-
3 files changed, 59 insertions(+), 35 deletions(-)
diffs (140 lines):
diff -r b41a73ca64e6 -r 34390e3aa8c5 ChangeLog
--- a/ChangeLog Thu Aug 16 01:51:50 2012 +0100
+++ b/ChangeLog Fri Aug 17 16:32:32 2012 +0200
@@ -1,3 +1,18 @@
+2012-08-17 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/ecj/hotspot.patch:
+ Make this patch file compatible with patch tool 2.5.4
+
+2012-08-16 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (add-zero.stamp): Setup drops directory by symlinking.
+ (add-zero-debug.stamp): Likewise.
+
+2012-08-16 Mark Wielaard <mark at klomp.org>
+
+ * Makefile.am (stamps/add-nss.stamp): Only try patching the
+ security files if they actually exist.
+
2012-08-16 Andrew John Hughes <ahughes at redhat.com>
PR1121: Old installs still suffer from GCC PR41686
diff -r b41a73ca64e6 -r 34390e3aa8c5 Makefile.am
--- a/Makefile.am Thu Aug 16 01:51:50 2012 +0100
+++ b/Makefile.am Fri Aug 17 16:32:32 2012 +0200
@@ -1611,43 +1611,47 @@
rm -f stamps/add-pulseaudio-debug.stamp
stamps/add-nss.stamp: stamps/icedtea.stamp
- cp -v $(abs_top_builddir)/nss.cfg \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security
- cp -v $(abs_top_builddir)/nss.cfg \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/security
- rm -f stamps/add-nss.stamp.tmp
- touch stamps/add-nss.stamp.tmp
- all_patches_ok=yes; \
- for dir in $(BUILD_OUTPUT_DIR)/{j2sdk-image/jre,j2re-image} ; \
- do \
- pushd $$dir ; \
- cp -v $$dir/lib/security/java.security{,.old} ; \
- for p in $(NSS_PATCHES) ; \
+ if [ -d $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security ] ; then \
+ cp -v $(abs_top_builddir)/nss.cfg \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; \
+ cp -v $(abs_top_builddir)/nss.cfg \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/security; \
+ rm -f stamps/add-nss.stamp.tmp; \
+ touch stamps/add-nss.stamp.tmp; \
+ all_patches_ok=yes; \
+ for dir in $(BUILD_OUTPUT_DIR)/{j2sdk-image/jre,j2re-image} ; \
do \
- if test x$${all_patches_ok} = "xyes" \
- && echo Checking $$p \
- && $(PATCH) -l -p0 --dry-run -s -t -f -F0 \
- < $(abs_top_srcdir)/$$p ; \
- then \
- echo Applying $$p ; \
- $(PATCH) -l -p0 -F0 < $(abs_top_srcdir)/$$p ; \
- if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
- >> $(abs_top_builddir)/stamps/add-nss.stamp.tmp ; \
+ pushd $$dir ; \
+ cp -v $$dir/lib/security/java.security{,.old} ; \
+ for p in $(NSS_PATCHES) ; \
+ do \
+ if test x$${all_patches_ok} = "xyes" \
+ && echo Checking $$p \
+ && $(PATCH) -l -p0 --dry-run -s -t -f -F0 \
+ < $(abs_top_srcdir)/$$p ; \
then \
- echo "* $$(basename $$p): UNDOCUMENTED" \
+ echo Applying $$p ; \
+ $(PATCH) -l -p0 -F0 < $(abs_top_srcdir)/$$p ; \
+ if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
>> $(abs_top_builddir)/stamps/add-nss.stamp.tmp ; \
+ then \
+ echo "* $$(basename $$p): UNDOCUMENTED" \
+ >> $(abs_top_builddir)/stamps/add-nss.stamp.tmp ; \
+ fi ; \
+ else \
+ test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
fi ; \
- else \
- test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
- fi ; \
+ done ; \
+ popd ; \
done ; \
- popd ; \
- done ; \
- mv stamps/add-nss.stamp.tmp stamps/add-nss.stamp ; \
- if ! test x$${all_patches_ok} = "xyes"; then \
- echo ERROR patch $${all_patches_ok} FAILED! ; \
- echo WARNING make clean-add-nss before retrying a fix ; \
- exit 2; \
+ mv stamps/add-nss.stamp.tmp stamps/add-nss.stamp ; \
+ if ! test x$${all_patches_ok} = "xyes"; then \
+ echo ERROR patch $${all_patches_ok} FAILED! ; \
+ echo WARNING make clean-add-nss before retrying a fix ; \
+ exit 2; \
+ fi \
+ else \
+ echo "NO $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security dir"; \
fi
clean-add-nss:
@@ -2194,7 +2198,8 @@
cd zerovm && \
$(ADD_ZERO_EXTRA_BUILD_ENV) \
- $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
+ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) && \
+ ln -s ../drops
: # create directories which are expected by icedtea components,
: # implicitly assumed to be created by the jdk build.
@@ -2253,7 +2258,8 @@
cd zerovm && \
$(ADD_ZERO_EXTRA_BUILD_ENV) \
- $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
+ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) && \
+ ln -s ../drops
$(ADD_ZERO_EXTRA_BUILD_ENV) \
$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET)
diff -r b41a73ca64e6 -r 34390e3aa8c5 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Thu Aug 16 01:51:50 2012 +0100
+++ b/patches/ecj/icedtea.patch Fri Aug 17 16:32:32 2012 +0200
@@ -346,7 +346,10 @@
diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000
+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000
-@@ -120,32 +120,14 @@
+@@ -116,35 +116,17 @@
+ CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
+ JAVACFLAGS += $(CLASS_VERSION)
+ JAVACFLAGS += -encoding ascii
-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
+JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar
JAVACFLAGS += $(OTHER_JAVACFLAGS)
More information about the distro-pkg-dev
mailing list