diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-13 16:23:19 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-24 10:10:23 +0100 |
commit | 44368437bb7c9948174b478bbf392330d0ba2c38 (patch) | |
tree | 1069d04957b210360c09ce97360eae4d1416c0e2 /meta-efl/recipes-efl | |
parent | 93440f94917b9d9ed127948de63eb789eea0029f (diff) | |
download | meta-openembedded-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.patch | 44 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/libeflvala_svn.bb | 1 |
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 000000000..84be133f6 --- /dev/null +++ b/meta-efl/recipes-efl/efl/libeflvala/disable.eina.test.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | It causes testeina.c build to fail linking to internal eina_.*_{init,shutdown} symbols | ||
2 | as reported in: | ||
3 | http://lists.alioth.debian.org/pipermail/pkg-fso-maint/2010-May/003056.html | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | |||
9 | diff -uNr vala/tests/testeina.vala ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala | ||
10 | --- vala/tests/testeina.vala 2014-01-13 16:16:53.984999035 +0100 | ||
11 | +++ ../../../arm920tt-oe-linux-gnueabi/libeflvala/1_2011.01.13.1+svnr82070-r2/vala/tests/testeina.vala 2010-02-26 09:02:06.000000000 +0100 | ||
12 | @@ -153,22 +153,22 @@ | ||
13 | |||
14 | void test_eina_benchmark() | ||
15 | { | ||
16 | - assert( Eina.Module.init() ); | ||
17 | - assert( Eina.List.init() ); | ||
18 | - assert( Eina.Array.init() ); | ||
19 | - assert( Eina.Benchmark.init() ); | ||
20 | - assert( Eina.Mempool.init() ); | ||
21 | +// assert( Eina.Module.init() ); | ||
22 | +// assert( Eina.List.init() ); | ||
23 | +// assert( Eina.Array.init() ); | ||
24 | +// assert( Eina.Benchmark.init() ); | ||
25 | +// assert( Eina.Mempool.init() ); | ||
26 | var b = new Eina.Benchmark( "test", "test"); | ||
27 | assert( b.register( "bogus", spec_one, 0, 100, 5 ) ); | ||
28 | unowned Eina.Array<string> result = b.run(); | ||
29 | assert( result.count_get() == 2 ); | ||
30 | result = null; | ||
31 | b = null; | ||
32 | - assert( Eina.Mempool.shutdown() ); | ||
33 | - assert( Eina.Benchmark.shutdown() ); | ||
34 | - assert( Eina.Array.shutdown() ); | ||
35 | - assert( Eina.List.shutdown() ); | ||
36 | - assert( Eina.Module.shutdown() ); | ||
37 | +// assert( Eina.Mempool.shutdown() ); | ||
38 | +// assert( Eina.Benchmark.shutdown() ); | ||
39 | +// assert( Eina.Array.shutdown() ); | ||
40 | +// assert( Eina.List.shutdown() ); | ||
41 | +// assert( Eina.Module.shutdown() ); | ||
42 | } | ||
43 | |||
44 | //=========================================================================== | ||
diff --git a/meta-efl/recipes-efl/efl/libeflvala_svn.bb b/meta-efl/recipes-efl/efl/libeflvala_svn.bb index 9f9ac44a2..b27590f5b 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" | |||
13 | inherit e-base autotools pkgconfig vala | 13 | inherit e-base autotools pkgconfig vala |
14 | 14 | ||
15 | SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};protocol=http \ | 15 | SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};protocol=http \ |
16 | file://disable.eina.test.patch \ | ||
16 | " | 17 | " |
17 | S = "${WORKDIR}/${SRCNAME}" | 18 | S = "${WORKDIR}/${SRCNAME}" |
18 | 19 | ||