/hg/icedtea: Fix build --with-addition-vms=cacao, update patches...

doko at icedtea.classpath.org doko at icedtea.classpath.org
Thu Jun 24 07:21:22 PDT 2010 

changeset 64285e351dc5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=64285e351dc5
author: doko at ubuntu.com
date: Thu Jun 24 16:20:37 2010 +0200

	Fix build --with-addition-vms=cacao, update patches for cacao
	prerelease builds

	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.
	        * patches/cacao/package-version.diff: Drop 'preX' from the cacao
	package version.
	        * patches/cacao/arm-arch-defines.patch: Remove cacao version fromi
	patched files.
	        * patches/cacao/package-version.patch: Likewise.


diffstat:

5 files changed, 37 insertions(+), 15 deletions(-)
ChangeLog                            |   10 ++++++++++
Makefile.am                          |    7 ++++---
patches/cacao/6714758.patch          |   12 ++++++------
patches/cacao/arm-arch-defines.patch |   12 ++++++------
patches/cacao/package-version.patch  |   11 +++++++++++

diffs (115 lines):

diff -r 03c860266712 -r 64285e351dc5 ChangeLog
--- a/ChangeLog	Wed Jun 23 00:15:52 2010 +0100
+++ b/ChangeLog	Thu Jun 24 16:20:37 2010 +0200
@@ -1,3 +1,13 @@ 2010-06-22 Andrew John Hughes  <ahughes@
+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.
+	* patches/cacao/package-version.diff: Drop 'preX' from the cacao
+	package version.
+	* patches/cacao/arm-arch-defines.patch: Remove cacao version fromi
+	patched files.
+	* patches/cacao/package-version.patch: Likewise.
+
 2010-06-22 Andrew John Hughes  <ahughes at redhat.com>
 
 	Remove VisualVM support, now maintained at
diff -r 03c860266712 -r 64285e351dc5 Makefile.am
--- a/Makefile.am	Wed Jun 23 00:15:52 2010 +0100
+++ b/Makefile.am	Thu Jun 24 16:20:37 2010 +0200
@@ -335,7 +335,8 @@ ICEDTEA_PATCHES += \
 	patches/cacao/arm-arch-defines.patch \
 	patches/cacao/jsig.patch \
 	patches/cacao/6714758.patch \
-	patches/cacao/memory.patch
+	patches/cacao/memory.patch \
+	patches/cacao/package-version.patch
 endif
 
 if WITH_CACAO
@@ -2202,7 +2203,7 @@ if ADD_CACAO_BUILD
 	mkdir -p $(BUILD_JRE_ARCH_DIR)/cacao
 	install -m 644 cacao/install/lib/libjvm.so \
 		$(BUILD_JRE_ARCH_DIR)/cacao/
-	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \
+	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \
 		$(BUILD_JRE_ARCH_DIR)/cacao/
 	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \
 		$(BUILD_JRE_ARCH_DIR)/cacao/
@@ -2222,7 +2223,7 @@ if ADD_CACAO_BUILD
 	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
 	install -m 644 cacao/install/lib/libjvm.so \
 		$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
-	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/libjsig.so \
+	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so \
 		$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
 	install -m 644 cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt \
 		$(BUILD_DEBUG_JRE_ARCH_DIR)/cacao/
diff -r 03c860266712 -r 64285e351dc5 patches/cacao/6714758.patch
--- a/patches/cacao/6714758.patch	Wed Jun 23 00:15:52 2010 +0100
+++ b/patches/cacao/6714758.patch	Thu Jun 24 16:20:37 2010 +0200
@@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacao-8948a434c10d/
-diff -Nru cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product
---- cacao.orig/cacao-8948a434c10d/contrib/mapfile-vers-product	2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao-8948a434c10d/contrib/mapfile-vers-product	2010-06-21 20:08:28.000000000 +0100
+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
 @@ -86,6 +86,7 @@
                  JVM_EnableCompiler;
                  JVM_Exit;
@@ -9,9 +9,9 @@ diff -Nru cacao.orig/cacao-8948a434c10d/
                  JVM_FindClassFromClass;
                  JVM_FindClassFromClassLoader;
                  JVM_FindLibraryEntry;
-diff -Nru cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp
---- cacao.orig/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp	2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp	2010-06-21 20:08:28.000000000 +0100
+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
 @@ -668,6 +668,9 @@
  
  	assert(throwError == false);
diff -r 03c860266712 -r 64285e351dc5 patches/cacao/arm-arch-defines.patch
--- a/patches/cacao/arm-arch-defines.patch	Wed Jun 23 00:15:52 2010 +0100
+++ b/patches/cacao/arm-arch-defines.patch	Thu Jun 24 16:20:37 2010 +0200
@@ -1,6 +1,6 @@ diff -Nru cacao.orig/cacao-8948a434c10d/
-diff -Nru cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
---- cacao.orig/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao-8948a434c10d/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-06-21 18:35:53.000000000 +0100
+diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
+--- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-06-21 18:35:53.000000000 +0100
 @@ -33,7 +33,13 @@
  
  /* NEC LE-IT: gcc has no way to easily check the arm architecture
@@ -16,9 +16,9 @@ diff -Nru cacao.orig/cacao-8948a434c10d/
  AO_INLINE void
  AO_nop_full()
  {
-diff -Nru cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp
---- cacao.orig/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp	2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao-8948a434c10d/src/vm/jit/arm/md-atomic.hpp	2010-06-21 18:35:53.000000000 +0100
+diff -Nru cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp cacao/cacao/src/vm/jit/arm/md-atomic.hpp
+--- cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp	2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp	2010-06-21 18:35:53.000000000 +0100
 @@ -45,26 +45,7 @@
   */
  inline uint32_t compare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval)
diff -r 03c860266712 -r 64285e351dc5 patches/cacao/package-version.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/package-version.patch	Thu Jun 24 16:20:37 2010 +0200
@@ -0,0 +1,11 @@
+--- 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