/hg/icedtea: Fix CACAO build and downloading. Bump to newer cha...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jun 24 18:15:27 PDT 2010
changeset 6870b368f4e5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6870b368f4e5
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jun 25 02:15:15 2010 +0100
Fix CACAO build and downloading. Bump to newer changeset with
optimisation and version parsing fix.
2010-06-24 Andrew John Hughes <ahughes at redhat.com>
* patches/cacao/package-version.patch: Removed;
breaks CACAO versioning.
* Makefile.am: Update to new changeset with optimisation
and version parsing fix. Fix downloading. (CACAO_BASE_URL):
Remove tip.tar.bz2 suffix. (CACAO_URL): Remove duplication
of /hg/cacao/archive. (CACAO_VERSION): Bump to changeset
which increases optimisation to -O2 not -O0.
(CACAO_SHA256SUM): Updated for above. (download-cacao):
Don't append CACAO_SRC_ZIP to URL.
* 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.
* patches/cacao/6714758.patch: Fix bad paths introduced by
previous changeset.
diffstat:
4 files changed, 32 insertions(+), 23 deletions(-)
ChangeLog | 23 ++++++++++++++++++++++-
Makefile.am | 13 ++++++-------
patches/cacao/6714758.patch | 8 ++++----
patches/cacao/package-version.patch | 11 -----------
diffs (107 lines):
diff -r 64285e351dc5 -r 6870b368f4e5 ChangeLog
--- a/ChangeLog Thu Jun 24 16:20:37 2010 +0200
+++ b/ChangeLog Fri Jun 25 02:15:15 2010 +0100
@@ -1,6 +1,27 @@ 2010-06-24 Matthias Klose <doko at ubuntu
+2010-06-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/cacao/package-version.patch:
+ Removed; breaks CACAO versioning.
+ * Makefile.am:
+ Update to new changeset with optimisation
+ and version parsing fix. Fix downloading.
+ (CACAO_BASE_URL): Remove tip.tar.bz2 suffix.
+ (CACAO_URL): Remove duplication of /hg/cacao/archive.
+ (CACAO_VERSION): Bump to changeset which
+ increases optimisation to -O2 not -O0.
+ (CACAO_SHA256SUM): Updated for above.
+ (download-cacao): Don't append CACAO_SRC_ZIP to URL.
+ * 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.
+ * patches/cacao/6714758.patch:
+ Fix bad paths introduced by previous changeset.
+
2010-06-24 Matthias Klose <doko at ubuntu.com>
- * Makefile.am (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp):
+ * Makefile.am
+ (stamps/add-cacao.stamp, stamps/add-cacao-debug.stamp):
Update libjsig.so installation location.
* patches/cacao/package-version.diff: Drop 'preX' from the cacao
package version.
diff -r 64285e351dc5 -r 6870b368f4e5 Makefile.am
--- a/Makefile.am Thu Jun 24 16:20:37 2010 +0200
+++ b/Makefile.am Fri Jun 25 02:15:15 2010 +0100
@@ -18,10 +18,10 @@ LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d
LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d948a07204904f6ce60e363bd0516e22f1cae830aba84f8
OPENJDK_SHA256SUM = 93c536e6bc4e962050a00321e88e694fc4e0000e2ad887b8de22830bfda2649f
-CACAO_VERSION = 8948a434c10d
-CACAO_SHA256SUM = e472e11621c3e1f00a5f49c990e68d18db09c6c12aea100950567b1577931412
-CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive/tip.tar.bz2
-CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
+CACAO_VERSION = 66e762d869dd
+CACAO_SHA256SUM = 9a558ffb69479f2d31995bdeb90cd2abc616050e76a6be7263c72e2e302ca4e6
+CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive
+CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
@@ -335,8 +335,7 @@ ICEDTEA_PATCHES += \
patches/cacao/arm-arch-defines.patch \
patches/cacao/jsig.patch \
patches/cacao/6714758.patch \
- patches/cacao/memory.patch \
- patches/cacao/package-version.patch
+ patches/cacao/memory.patch
endif
if WITH_CACAO
@@ -1101,7 +1100,7 @@ endif
then \
mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
fi ; \
- $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
+ $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of CACAO zip"; false; \
diff -r 64285e351dc5 -r 6870b368f4e5 patches/cacao/6714758.patch
--- a/patches/cacao/6714758.patch Thu Jun 24 16:20:37 2010 +0200
+++ b/patches/cacao/6714758.patch Fri Jun 25 02:15:15 2010 +0100
@@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacaog/contrib/mapf
diff -Nru cacao.orig/cacaog/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product
---- cacao.orig/cacaog/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacaog/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100
+--- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100
@@ -86,6 +86,7 @@
JVM_EnableCompiler;
JVM_Exit;
@@ -10,8 +10,8 @@ diff -Nru cacao.orig/cacaog/contrib/mapf
JVM_FindClassFromClassLoader;
JVM_FindLibraryEntry;
diff -Nru cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp
---- cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacaog/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100
+--- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100
@@ -668,6 +668,9 @@
assert(throwError == false);
diff -r 64285e351dc5 -r 6870b368f4e5 patches/cacao/package-version.patch
--- a/patches/cacao/package-version.patch Thu Jun 24 16:20:37 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- cacao/cacao/m4/version.m4~ 2010-06-23 17:18:58.000000000 +0200
-+++ cacao/cacao/m4/version.m4 2010-06-23 21:00:36.739828757 +0200
-@@ -24,7 +24,7 @@
- dnl define detailed version numbers
-
- AC_DEFUN([AC_VERSION_DETAIL],[
--version="$PACKAGE_VERSION"
-+version=$(echo "$PACKAGE_VERSION" | sed 's/pre.*//')
- if test x`echo "$version" | $SED -e 's/[[0-9a-z+]]*//g'` = "x..";
- then
- major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
More information about the distro-pkg-dev
mailing list