[oe-commits] org.oe.dev merge of 'bb62cdee9cf4ddc24862a7f51bb4b176bc249b7a'

[oe commit]

merge of 'bb62cdee9cf4ddc24862a7f51bb4b176bc249b7a'
     and 'cc931d5c43ef85abee7c221aabb801302e9c1ee8'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: efbba0f30c31059b997317c4ea40342a11b3ed4f
ViewMTN: http://monotone.openembedded.org/revision/info/efbba0f30c31059b997317c4ea40342a11b3ed4f
Files:
1
packages/ckermit/ckermit_211.bb
packages/meta/external-toolchain.bb
packages/libeventdb/libeventdb-0.90
packages/libeventdb/libeventdb-0.90/libeventdb-unbreak-LIVE-macro.patch
packages/libeventdb/libeventdb_0.90.bb
Diffs:

#
# mt diff -rbb62cdee9cf4ddc24862a7f51bb4b176bc249b7a -refbba0f30c31059b997317c4ea40342a11b3ed4f
#
#
#
# patch "packages/ckermit/ckermit_211.bb"
#  from [539eed0679571bbfd38f2d6d4f7a9650775cfbfb]
#    to [31cbe46998dbc4695f3cd278c30d53c7f45e9e11]
# 
# patch "packages/meta/external-toolchain.bb"
#  from [ae708894e0ca9c843e90e9f9efa0097001c3889f]
#    to [ebcd8679c393d51824573b5a70c7a071f8521117]
#
============================================================
--- packages/ckermit/ckermit_211.bb	539eed0679571bbfd38f2d6d4f7a9650775cfbfb
+++ packages/ckermit/ckermit_211.bb	31cbe46998dbc4695f3cd278c30d53c7f45e9e11
@@ -49,15 +49,8 @@ PR = "r1"
 # ... and probably other distro's as well.
 #
 
+S = "${WORKDIR}"
 
-
-python do_unpack () {
-	bb.mkdirhier(bb.data.expand('${S}', d))
-	bb.build.exec_func('base_do_unpack', d, [ '${S}' ])
-}
-
-
-
 export CC2 = "${CC}"
 export BINDIR = "${bindir}"
 export MANDIR = "${mandir}/man1"
============================================================
--- packages/meta/external-toolchain.bb	ae708894e0ca9c843e90e9f9efa0097001c3889f
+++ packages/meta/external-toolchain.bb	ebcd8679c393d51824573b5a70c7a071f8521117
@@ -11,7 +11,6 @@ PROVIDES = "\
     virtual/libc \
     virtual/libintl \
     virtual/libiconv \
-    glibc-thread-db \
     "
 
 RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"


#
# mt diff -rcc931d5c43ef85abee7c221aabb801302e9c1ee8 -refbba0f30c31059b997317c4ea40342a11b3ed4f
#
#
#
# add_dir "packages/libeventdb/libeventdb-0.90"
# 
# add_file "packages/libeventdb/libeventdb-0.90/libeventdb-unbreak-LIVE-macro.patch"
#  content [a74bd82bdb025e1897caa8f3942919827d33218a]
# 
# patch "packages/libeventdb/libeventdb_0.90.bb"
#  from [f7cd7ccf69494c816675221c17c3899b3485ad74]
#    to [738c256ae74f236f5026dc43135bba70f5e39e16]
#
============================================================
--- packages/libeventdb/libeventdb-0.90/libeventdb-unbreak-LIVE-macro.patch	a74bd82bdb025e1897caa8f3942919827d33218a
+++ packages/libeventdb/libeventdb-0.90/libeventdb-unbreak-LIVE-macro.patch	a74bd82bdb025e1897caa8f3942919827d33218a
@@ -0,0 +1,11 @@
+--- libeventdb-0.90/event.h.orig	2008-03-13 23:05:10.000000000 -0700
++++ libeventdb-0.90/event.h	2008-03-13 23:05:40.000000000 -0700
+@@ -130,7 +130,7 @@ extern GSList *event_list (EventSource *
+ 			   GError **error)
+      __attribute__ ((visibility ("hidden")));
+ 
+-#define LIVE(ev) (g_assert (! EVENT (ev)->dead))
++#define LIVE(ev) G_STMT_START { g_assert (! EVENT (ev)->dead); } G_STMT_END
+ 
+ /* Marks the event as well as the calendar in which lives as
+    modified.  */
============================================================
--- packages/libeventdb/libeventdb_0.90.bb	f7cd7ccf69494c816675221c17c3899b3485ad74
+++ packages/libeventdb/libeventdb_0.90.bb	738c256ae74f236f5026dc43135bba70f5e39e16
@@ -1,3 +1,4 @@ require libeventdb.inc
 require libeventdb.inc
 
+PR = "r2"
+SRC_URI += "file://libeventdb-unbreak-LIVE-macro.patch;patch=1"
-PR = "r1"