From: Robert Schuster <theBohemian@gmx.net>
To: openembedded-devel@lists.openembedded.org,
John Lee <john_lee@openmoko.com>
Subject: Re: [oe-commits] org.oe.dev cacao: add hg version 8190 and the corresponding cacaoh-native.
Date: Thu, 22 May 2008 07:51:38 +0200 [thread overview]
Message-ID: <483509EA.4080902@gmx.net> (raw)
In-Reply-To: <20080521120136.903A91892F8@amethyst.openembedded.net>
[-- Attachment #1: Type: text/plain, Size: 8714 bytes --]
Hi John Lee,
please use the corresponding date instead of the hg revision number.
Reason is that in mercurial revision numbers are local and not equal
between different users.
Regards
Robert
john_lee commit schrieb:
> cacao: add hg version 8190 and the corresponding cacaoh-native.
>
> Author: john_lee@openembedded.org
> Branch: org.openembedded.dev
> Revision: e7e8e506f89a6a1476f5dc6b5fbd52227c4bc198
> ViewMTN: http://monotone.openembedded.org/revision/info/e7e8e506f89a6a1476f5dc6b5fbd52227c4bc198
> Files:
> 1
> packages/cacao/cacao_0.98+hg8190.bb
> packages/cacao/cacaoh-native_0.98+hg8190.bb
> packages/cacao/files/cacao-hg8190-classpath_var.patch
> packages/cacao/files/cacao-hg8190-libdir.patch
> Diffs:
>
> #
> # mt diff -rd3e6d2bafdfc9d3b6ae568792b3d8843a955a119 -re7e8e506f89a6a1476f5dc6b5fbd52227c4bc198
> #
> #
> #
> # add_file "packages/cacao/cacao_0.98+hg8190.bb"
> # content [7796571ddad2e693b74e3cf2891c18934c196fde]
> #
> # add_file "packages/cacao/cacaoh-native_0.98+hg8190.bb"
> # content [126e7d435273831e60739cc2c81d607a445e9197]
> #
> # add_file "packages/cacao/files/cacao-hg8190-classpath_var.patch"
> # content [62477b682d6cb20be67ab015423d22c6412ac5f8]
> #
> # add_file "packages/cacao/files/cacao-hg8190-libdir.patch"
> # content [7b12857a339294deb7df47da33c5e9db8290107a]
> #
> ============================================================
> --- packages/cacao/cacao_0.98+hg8190.bb 7796571ddad2e693b74e3cf2891c18934c196fde
> +++ packages/cacao/cacao_0.98+hg8190.bb 7796571ddad2e693b74e3cf2891c18934c196fde
> @@ -0,0 +1,24 @@
> +require cacao.inc
> +
> +PR = "r0"
> +
> +SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg8190.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \
> + file://cacao-hg8190-classpath_var.patch;patch=1 \
> + file://cacao-hg8190-libdir.patch;patch=1 \
> + "
> +
> +S = "${WORKDIR}/cacao"
> +
> +EXTRA_OECONF = "\
> + ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
> + --enable-debug \
> + --with-vm-zip=${datadir}/cacao/vm.zip \
> + --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
> + --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
> + --with-target-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
> + --with-java-runtime-library-libdir=${libdir} \
> + --with-jni_md_h=${STAGING_INCDIR}/classpath \
> + --with-jni_h=${STAGING_INCDIR}/classpath \
> + "
> +
> +DEFAULT_PREFERENCE = "-1"
> ============================================================
> --- packages/cacao/cacaoh-native_0.98+hg8190.bb 126e7d435273831e60739cc2c81d607a445e9197
> +++ packages/cacao/cacaoh-native_0.98+hg8190.bb 126e7d435273831e60739cc2c81d607a445e9197
> @@ -0,0 +1,15 @@
> +require cacaoh-native.inc
> +
> +PR = "r0"
> +
> +SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg8190.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f"
> +
> +S = "${WORKDIR}/cacao"
> +
> +EXTRA_OECONF = " \
> + --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
> + --with-jni_md_h=${STAGING_INCDIR}/classpath \
> + --with-jni_h=${STAGING_INCDIR}/classpath \
> + "
> +
> +DEFAULT_PREFERENCE = "-1"
> ============================================================
> --- packages/cacao/files/cacao-hg8190-classpath_var.patch 62477b682d6cb20be67ab015423d22c6412ac5f8
> +++ packages/cacao/files/cacao-hg8190-classpath_var.patch 62477b682d6cb20be67ab015423d22c6412ac5f8
> @@ -0,0 +1,67 @@
> +Index: cacao/configure.ac
> +===================================================================
> +--- cacao.orig/configure.ac 2008-05-21 14:16:33.000000000 +0800
> ++++ cacao/configure.ac 2008-05-21 15:57:42.000000000 +0800
> +@@ -772,6 +772,7 @@
> +
> + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
> + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
> ++AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES
> +
> + if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
> + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
> +Index: cacao/m4/java-runtime-library.m4
> +===================================================================
> +--- cacao.orig/m4/java-runtime-library.m4 2008-05-21 14:16:34.000000000 +0800
> ++++ cacao/m4/java-runtime-library.m4 2008-05-21 16:18:23.000000000 +0800
> +@@ -106,6 +106,29 @@
> + ])
> +
> +
> ++dnl where are Java runtime library classes installed on the target
> ++
> ++AC_DEFUN([AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES],[
> ++AC_MSG_CHECKING(where Java runtime library classes are installed on the target)
> ++AC_ARG_WITH([target-java-runtime-library-classes],
> ++ [AS_HELP_STRING(--with-target-java-runtime-library-classes=<path>,path to Java runtime library classes (includes the name of the file and may be flat) [[default=(gnuclasspath:${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip,openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes,*:${JAVA_RUNTIME_LIBRARY_PREFIX})]])],
> ++ [TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
> ++ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
> ++ gnuclasspath)
> ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip
> ++ ;;
> ++ openjdk)
> ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes
> ++ ;;
> ++ *)
> ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}
> ++ ;;
> ++ esac])
> ++AC_MSG_RESULT(${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES})
> ++AC_DEFINE_UNQUOTED([TARGET_JAVA_RUNTIME_LIBRARY_CLASSES], "${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes on the target])
> ++AC_SUBST(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES)
> ++])
> ++
> + dnl where are Java runtime library native libraries installed
> +
> + AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
> +Index: cacao/src/vm/properties.c
> +===================================================================
> +--- cacao.orig/src/vm/properties.c 2008-05-21 14:16:34.000000000 +0800
> ++++ cacao/src/vm/properties.c 2008-05-21 16:16:24.000000000 +0800
> +@@ -295,14 +295,14 @@
> + len =
> + strlen(CACAO_VM_ZIP) +
> + strlen(":") +
> +- strlen(JAVA_RUNTIME_LIBRARY_CLASSES) +
> ++ strlen(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) +
> + strlen("0");
> +
> + boot_class_path = MNEW(char, len);
> +
> + strcpy(boot_class_path, CACAO_VM_ZIP);
> + strcat(boot_class_path, ":");
> +- strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_CLASSES);
> ++ strcat(boot_class_path, TARGET_JAVA_RUNTIME_LIBRARY_CLASSES);
> +
> + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
> +
> ============================================================
> --- packages/cacao/files/cacao-hg8190-libdir.patch 7b12857a339294deb7df47da33c5e9db8290107a
> +++ packages/cacao/files/cacao-hg8190-libdir.patch 7b12857a339294deb7df47da33c5e9db8290107a
> @@ -0,0 +1,30 @@
> +Index: cacao/src/vm/properties.c
> +===================================================================
> +--- cacao.orig/src/vm/properties.c 2008-05-21 15:26:21.000000000 +0800
> ++++ cacao/src/vm/properties.c 2008-05-21 15:28:59.000000000 +0800
> +@@ -211,15 +211,22 @@
> +
> + # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
> +
> +- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath";
> ++ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath:OE_LIBDIR_JNI";
> +
> + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
> +
> +- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR;
> ++ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR":OE_LIBDIR_JNI";
> +
> + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
> +
> +- /* No boot_library_path required. */
> ++ /* No boot_library_path required.
> ++ Well, don't be that strict on Debian-like
> ++ environments. Setting this to /usr/lib/jni
> ++ makes it unneccessary to fumble with
> ++ LD_LIBRARY_PATH to get things like MIDPath
> ++ running.
> ++ */
> ++ boot_library_path = "OE_LIBDIR_JNI";
> +
> + # else
> + # error unknown classpath configuration
>
>
>
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
next parent reply other threads:[~2008-05-22 5:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080521120136.903A91892F8@amethyst.openembedded.net>
2008-05-22 5:51 ` Robert Schuster [this message]
2008-05-22 9:59 ` [oe-commits] org.oe.dev cacao: add hg version 8190 and the corresponding cacaoh-native Holger Freyther
2008-05-22 10:54 ` Koen Kooi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=483509EA.4080902@gmx.net \
--to=thebohemian@gmx.net \
--cc=john_lee@openmoko.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.