summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-05-06 00:04:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-07 13:40:36 +0100
commit2a743d65f42e4d2a136b68ed1240762a4d4fb8e5 (patch)
tree2ebdc25e22e4add3776941245d7258f1e5ba8750
parent02d0a003d603266114512160b209876199241e98 (diff)
downloadpoky-2a743d65f42e4d2a136b68ed1240762a4d4fb8e5.tar.gz
libart-lgpl: Fix cross compiling
We use standard ISO C data types and get rid of configure guess work which is iffy in cross compiled environment. Cleans up the re-build as well since we were deleting art_config.h without considering if the file is there in first place or not. (From OE-Core rev: b6a1d8b4a62c6f43c610acb27e935e62dbb75f97) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch84
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb10
2 files changed, 87 insertions, 7 deletions
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch b/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
new file mode 100644
index 0000000000..0261f58c90
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
@@ -0,0 +1,84 @@
1Taken from portage
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001
7From: Gilles Dartiguelongue <eva@gentoo.org>
8Date: Tue, 6 Apr 2010 15:22:25 +0200
9Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size
10
11---
12 Makefile.am | 11 ++---------
13 art_config.h | 5 +++++
14 configure.in | 10 ----------
15 3 files changed, 7 insertions(+), 19 deletions(-)
16 create mode 100644 art_config.h
17
18diff --git a/Makefile.am b/Makefile.am
19index 95952da..6aa2fe3 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta
23
24 bin_SCRIPTS = \
25 libart2-config
26-
27-noinst_SCRIPTS = gen_art_config.sh
28-
29-BUILT_SOURCES = art_config.h
30-
31-art_config.h:
32- ./gen_art_config.sh > art_config.h
33
34 EXTRA_DIST = \
35 libart.def \
36@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib
37
38 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
39
40-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
41-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
42+CLEANFILES = $(bin_SCRIPTS)
43+DISTCLEANFILES = $(bin_SCRIPTS)
44diff --git a/art_config.h b/art_config.h
45new file mode 100644
46index 0000000..5985f1f
47--- a/art_config.h
48+++ b/art_config.h
49@@ -0,0 +1,5 @@
50+#include <stdint.h>
51+
52+typedef uint8_t art_u8;
53+typedef uint16_t art_u16;
54+typedef uint32_t art_u32;
55diff --git a/configure.in b/configure.in
56index e4804f7..ddcac4f 100644
57--- a/configure.in
58+++ b/configure.in
59@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA
60
61 AC_C_BIGENDIAN
62
63-AC_CHECK_SIZEOF(char)
64-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
65-AC_CHECK_SIZEOF(short)
66-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
67-AC_CHECK_SIZEOF(int)
68-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
69-AC_CHECK_SIZEOF(long)
70-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
71-
72 AC_CONFIG_FILES([
73 libart-features.h
74 Makefile
75@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc
76 libart-zip])
77
78 AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
79-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
80
81 AC_OUTPUT
82--
831.7.0.4
84
diff --git a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
index 138461684c..95581b297c 100644
--- a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
+++ b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
5PR = "r2" 5PR = "r2"
6 6
7# can't use gnome.oeclass due to _ in filename 7# can't use gnome.oeclass due to _ in filename
8SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2" 8SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
9 file://libart_lgpl-2.3.21-crosscompile.patch \
10 "
9 11
10SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302" 12SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302"
11SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa" 13SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"
@@ -18,9 +20,3 @@ FILES_${PN} = "${libdir}/*.so.*"
18FILES_${PN}-dev += "${bindir}/libart2-config" 20FILES_${PN}-dev += "${bindir}/libart2-config"
19 21
20S = "${WORKDIR}/libart_lgpl-${PV}" 22S = "${WORKDIR}/libart_lgpl-${PV}"
21
22do_compile_prepend() {
23 # enforce regeneration of art_config.h
24 rm ${S}/art_config.h
25}
26