aboutsummaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-01-13 16:23:19 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-24 10:10:23 +0100
commit44368437bb7c9948174b478bbf392330d0ba2c38 (patch)
tree1069d04957b210360c09ce97360eae4d1416c0e2 /meta-efl/recipes-efl
parent93440f94917b9d9ed127948de63eb789eea0029f (diff)
downloadmeta-openembedded-contrib-44368437bb7c9948174b478bbf392330d0ba2c38.tar.gz
libeflvala: Fix build of tests
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl')
-rw-r--r--meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch44
-rw-r--r--meta-efl/recipes-efl/efl/libeflvala_svn.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch b/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch
new file mode 100644
index 0000000000..84be133f6a
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch
@@ -0,0 +1,44 @@
+It causes testeina.c build to fail linking to internal eina_.*_{init,shutdown} symbols
+as reported in:
+http://lists.alioth.debian.org/pipermail/pkg-fso-maint/2010-May/003056.html
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+diff -uNr vala/tests/testeina.vala ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala
+--- vala/tests/testeina.vala 2014-01-13 16:16:53.984999035 +0100
++++ ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala 2010-02-26 09:02:06.000000000 +0100
+@@ -153,22 +153,22 @@
+
+ void test_eina_benchmark()
+ {
+- assert( Eina.Module.init() );
+- assert( Eina.List.init() );
+- assert( Eina.Array.init() );
+- assert( Eina.Benchmark.init() );
+- assert( Eina.Mempool.init() );
++// assert( Eina.Module.init() );
++// assert( Eina.List.init() );
++// assert( Eina.Array.init() );
++// assert( Eina.Benchmark.init() );
++// assert( Eina.Mempool.init() );
+ var b = new Eina.Benchmark( "test", "test");
+ assert( b.register( "bogus", spec_one, 0, 100, 5 ) );
+ unowned Eina.Array<string> result = b.run();
+ assert( result.count_get() == 2 );
+ result = null;
+ b = null;
+- assert( Eina.Mempool.shutdown() );
+- assert( Eina.Benchmark.shutdown() );
+- assert( Eina.Array.shutdown() );
+- assert( Eina.List.shutdown() );
+- assert( Eina.Module.shutdown() );
++// assert( Eina.Mempool.shutdown() );
++// assert( Eina.Benchmark.shutdown() );
++// assert( Eina.Array.shutdown() );
++// assert( Eina.List.shutdown() );
++// assert( Eina.Module.shutdown() );
+ }
+
+ //===========================================================================
diff --git a/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
index 9f9ac44a20..b27590f5b0 100644
--- a/meta-efl/recipes-efl/efl/libeflvala_svn.bb
+++ b/meta-efl/recipes-efl/efl/libeflvala_svn.bb
@@ -13,6 +13,7 @@ SRCNAME = "vala"
inherit e-base autotools pkgconfig vala
SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};protocol=http \
+ file://disable.eina.test.patch \
"
S = "${WORKDIR}/${SRCNAME}"