* [2011.03-maintenance] @ 2011-07-08 14:17 George C. Huntington III 2011-07-08 14:17 ` [2011.03-maintenance] cacao-native_hg: Fix cacao-shutdownguard.patch George C. Huntington III 2011-07-09 15:14 ` [2011.03-maintenance] Tom Rini 0 siblings, 2 replies; 5+ messages in thread From: George C. Huntington III @ 2011-07-08 14:17 UTC (permalink / raw) To: openembedded-devel; +Cc: George C. Huntington III Cherry-pick: 0f0ee32d7045bc75ce9759805d04874499f1c958 Tested-by: George C. Huntington III <gchiii@mtiemail.com> please add this to the 2011.03-maintenance branch (sorry, i think i screwed up my last attempt to send this request) Robert Schuster (1): cacao-native_hg: Fix cacao-shutdownguard.patch recipes/cacao/cacao-native_hg.bb | 2 +- recipes/cacao/files/cacao-shutdownguard.patch | 32 +++++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [2011.03-maintenance] cacao-native_hg: Fix cacao-shutdownguard.patch 2011-07-08 14:17 [2011.03-maintenance] George C. Huntington III @ 2011-07-08 14:17 ` George C. Huntington III 2011-07-09 15:14 ` [2011.03-maintenance] Tom Rini 1 sibling, 0 replies; 5+ messages in thread From: George C. Huntington III @ 2011-07-08 14:17 UTC (permalink / raw) To: openembedded-devel; +Cc: Robert Schuster, Stefan Schmidt From: Robert Schuster <r.schuster@tarent.de> The patch contained some left-over debug code which can result into problems if other programs (like configure) relays on the output of the JVM Signed-off-by: Stefan Schmidt <stefan@buglabs.net> --- recipes/cacao/cacao-native_hg.bb | 2 +- recipes/cacao/files/cacao-shutdownguard.patch | 32 +++++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/recipes/cacao/cacao-native_hg.bb b/recipes/cacao/cacao-native_hg.bb index dc35ce8..020dee3 100644 --- a/recipes/cacao/cacao-native_hg.bb +++ b/recipes/cacao/cacao-native_hg.bb @@ -1,7 +1,7 @@ require cacao-native.inc PV = "1.1.0+hgr${SRCPV}" -PR = "r4" +PR = "r5" SRCREV = "c7bf150bfa46" SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV} \ diff --git a/recipes/cacao/files/cacao-shutdownguard.patch b/recipes/cacao/files/cacao-shutdownguard.patch index b89170c..b0d9d92 100644 --- a/recipes/cacao/files/cacao-shutdownguard.patch +++ b/recipes/cacao/files/cacao-shutdownguard.patch @@ -1,6 +1,7 @@ -diff -r c7bf150bfa46 src/threads/posix/mutex-posix.hpp ---- a/src/threads/posix/mutex-posix.hpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/threads/posix/mutex-posix.hpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/threads/posix/mutex-posix.hpp +=================================================================== +--- cacao.orig/src/threads/posix/mutex-posix.hpp 2011-03-08 13:13:00.000000000 +0100 ++++ cacao/src/threads/posix/mutex-posix.hpp 2011-05-10 11:51:48.534869875 +0200 @@ -53,6 +53,9 @@ inline void lock(); @@ -80,9 +81,10 @@ diff -r c7bf150bfa46 src/threads/posix/mutex-posix.hpp #else // This structure must have the same layout as the class above. -diff -r c7bf150bfa46 src/threads/posix/thread-posix.cpp ---- a/src/threads/posix/thread-posix.cpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/threads/posix/thread-posix.cpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/threads/posix/thread-posix.cpp +=================================================================== +--- cacao.orig/src/threads/posix/thread-posix.cpp 2011-03-17 10:41:29.000000000 +0100 ++++ cacao/src/threads/posix/thread-posix.cpp 2011-05-10 11:51:48.534869875 +0200 @@ -74,6 +74,23 @@ #include "vm/string.hpp" #include "vm/vm.hpp" @@ -107,9 +109,10 @@ diff -r c7bf150bfa46 src/threads/posix/thread-posix.cpp #if defined(ENABLE_STATISTICS) # include "vm/statistics.h" #endif -diff -r c7bf150bfa46 src/vm/vm.cpp ---- a/src/vm/vm.cpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/vm/vm.cpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/vm/vm.cpp +=================================================================== +--- cacao.orig/src/vm/vm.cpp 2011-03-17 10:41:29.000000000 +0100 ++++ cacao/src/vm/vm.cpp 2011-05-10 11:56:36.564882762 +0200 @@ -52,6 +52,7 @@ #include "native/vm/nativevm.hpp" @@ -141,12 +144,10 @@ diff -r c7bf150bfa46 src/vm/vm.cpp /* vm_run ********************************************************************** -@@ -1865,6 +1882,15 @@ +@@ -1865,6 +1882,13 @@ void vm_shutdown(s4 status) { -+ log_println("vm_shutdown"); -+ + if (VM::get_current()->shutdown_guard()) + { + /* Shutdown in progress by another thread already. @@ -157,9 +158,10 @@ diff -r c7bf150bfa46 src/vm/vm.cpp if (opt_verbose #if defined(ENABLE_STATISTICS) || opt_getcompilingtime || opt_stat -diff -r c7bf150bfa46 src/vm/vm.hpp ---- a/src/vm/vm.hpp Fri Mar 11 23:35:56 2011 +0100 -+++ b/src/vm/vm.hpp Fri Apr 01 16:16:07 2011 +0200 +Index: cacao/src/vm/vm.hpp +=================================================================== +--- cacao.orig/src/vm/vm.hpp 2011-03-08 13:13:00.000000000 +0100 ++++ cacao/src/vm/vm.hpp 2011-05-10 11:51:48.554844342 +0200 @@ -64,6 +64,7 @@ bool _initializing; bool _created; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [2011.03-maintenance] 2011-07-08 14:17 [2011.03-maintenance] George C. Huntington III 2011-07-08 14:17 ` [2011.03-maintenance] cacao-native_hg: Fix cacao-shutdownguard.patch George C. Huntington III @ 2011-07-09 15:14 ` Tom Rini 1 sibling, 0 replies; 5+ messages in thread From: Tom Rini @ 2011-07-09 15:14 UTC (permalink / raw) To: openembedded-devel -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 07/08/2011 07:17 AM, George C. Huntington III wrote: > Cherry-pick: 0f0ee32d7045bc75ce9759805d04874499f1c958 > Tested-by: George C. Huntington III <gchiii@mtiemail.com> > > please add this to the 2011.03-maintenance branch > (sorry, i think i screwed up my last attempt to send this request) > > > Robert Schuster (1): > cacao-native_hg: Fix cacao-shutdownguard.patch > > recipes/cacao/cacao-native_hg.bb | 2 +- > recipes/cacao/files/cacao-shutdownguard.patch | 32 +++++++++++++----------- > 2 files changed, 18 insertions(+), 16 deletions(-) Applied, thanks! - -- Tom Rini Mentor Graphics Corporation -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJOGHBNAAoJEI4NMjfc3nJxuOsH/1O/ZfgfQgeBC1LsPmlMFAIN KZZORUK8fr1fTnkX6ANcCm3vSGWlxLG+1M3K0tr877aQ6Zi9FCqfHQHwVo328wlW r/sU5sipDQksaIhRkbgjUSr2wojTDd2OLaHcn0SOGdQ30ZAOMffK+uh9p4SwUbDF ccVX9SyOJzS/jZ2JlbVzKGsVh9TeL0XQuScx/+YZ2/s98bp7VFxNixktQSXBh9Vf Rn6hD9lTInPQKZtX02JFCyyyNzcG+r6auV+GkBD5FPFjkY1oPar+mNPFoEBhKOFl rxrWiDCiHz+y08WW1s17wRaHr9VunGhZH5qF1MwK59jUVIcYWmhmg4SbGZcXqg4= =gHu5 -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 5+ messages in thread
* [2011.03-maintenance] @ 2011-07-28 20:19 Ben Gardiner 2011-07-29 21:19 ` [2011.03-maintenance] Tom Rini 0 siblings, 1 reply; 5+ messages in thread From: Ben Gardiner @ 2011-07-28 20:19 UTC (permalink / raw) To: openembedded-devel Cherry-pick: f1d24b5a986233f869364eb109476f5184e76d10 Tested-by: Ben Gardiner <bengardiner@nanometrics.ca> please add this to the 2011.03-maintenance branch Ben Gardiner (1): raptor: add libxml2 DEPENDS recipes/raptor/raptor_1.4.21.bb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [2011.03-maintenance] 2011-07-28 20:19 [2011.03-maintenance] Ben Gardiner @ 2011-07-29 21:19 ` Tom Rini 0 siblings, 0 replies; 5+ messages in thread From: Tom Rini @ 2011-07-29 21:19 UTC (permalink / raw) To: openembedded-devel -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 07/28/2011 01:19 PM, Ben Gardiner wrote: > Cherry-pick: f1d24b5a986233f869364eb109476f5184e76d10 > Tested-by: Ben Gardiner <bengardiner@nanometrics.ca> > > please add this to the 2011.03-maintenance branch > > Ben Gardiner (1): > raptor: add libxml2 DEPENDS > > recipes/raptor/raptor_1.4.21.bb | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) Applied, thanks! - -- Tom Rini Mentor Graphics Corporation -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJOMyPuAAoJEI4NMjfc3nJxDyQH/A0XKovaPl5gz9JmXaOU8gIa d6xcftM8qgilCl244zGPCg6GqgjsFrlitxo51gZmcsXB9Uhg9lczC94ywicvoXTt EhbmkegBO0B5VSFk1cvVm92/NRJen7WnwRWR99DCn8wWYevx59RXU3cvRNFNHgS/ Q+Wue5HGiYullZM3zTES8C90bLwvIAHey1dgp5HjHoFVSE5BklgqfgJl+4fwe63X 2fH7DBC+dhFQD4bq5Qr1TRzucc8mQ5vS1EDHdV3xPj3EUbOwucJcOAMNm7yzpKxj s+c4CVI6RI1FKG6KWyZS13UCUa5e59hvOKnY9Rwd50aAsW/CmJYgUWNlfqdr6H8= =RV/E -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-07-29 21:24 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-07-08 14:17 [2011.03-maintenance] George C. Huntington III 2011-07-08 14:17 ` [2011.03-maintenance] cacao-native_hg: Fix cacao-shutdownguard.patch George C. Huntington III 2011-07-09 15:14 ` [2011.03-maintenance] Tom Rini -- strict thread matches above, loose matches on Subject: below -- 2011-07-28 20:19 [2011.03-maintenance] Ben Gardiner 2011-07-29 21:19 ` [2011.03-maintenance] Tom Rini
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.