mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-21 00:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

libart-lgpl: Fix cross compiling

Browse Source 
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>
This commit is contained in:
Khem Raj
2015-05-06 00:04:59 -07:00
committed by Richard Purdie
parent 02d0a003d6
commit 2a743d65f4
2 changed files with 87 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch Normal file
View File

@@ -0,0 +1,84 @@
Taken from portage
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
From e1443c945a4cf67096d8c27721aadd7368382b3f Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Tue, 6 Apr 2010 15:22:25 +0200
Subject: [PATCH 2/2] gentoo: use ISO types for fixed type size
---
Makefile.am | 11 ++---------
art_config.h | 5 +++++
configure.in | 10 ----------
3 files changed, 7 insertions(+), 19 deletions(-)
create mode 100644 art_config.h
diff --git a/Makefile.am b/Makefile.am
index 95952da..6aa2fe3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,6 @@ check_PROGRAMS = testart testuta
bin_SCRIPTS = \
libart2-config
-
-noinst_SCRIPTS = gen_art_config.sh
-
-BUILT_SOURCES = art_config.h
-
-art_config.h:
- ./gen_art_config.sh > art_config.h
EXTRA_DIST = \
libart.def \
@@ -173,5 +166,5 @@ install-data-local: install-ms-lib install-libtool-import-lib
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
-CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
-DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS)
+CLEANFILES = $(bin_SCRIPTS)
+DISTCLEANFILES = $(bin_SCRIPTS)
diff --git a/art_config.h b/art_config.h
new file mode 100644
index 0000000..5985f1f
--- a/art_config.h
+++ b/art_config.h
@@ -0,0 +1,5 @@
+#include <stdint.h>
+
+typedef uint8_t art_u8;
+typedef uint16_t art_u16;
+typedef uint32_t art_u32;
diff --git a/configure.in b/configure.in
index e4804f7..ddcac4f 100644
--- a/configure.in
+++ b/configure.in
@@ -92,15 +92,6 @@ AC_FUNC_ALLOCA
AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(char)
-AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
-AC_CHECK_SIZEOF(short)
-AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
-AC_CHECK_SIZEOF(int)
-AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
-AC_CHECK_SIZEOF(long)
-AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
-
AC_CONFIG_FILES([
libart-features.h
Makefile
@@ -109,6 +100,5 @@ libart-2.0-uninstalled.pc
libart-zip])
AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
AC_OUTPUT
--
1.7.0.4

10
meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
View File

@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
PR = "r2"
# can't use gnome.oeclass due to _ in filename
SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2"
SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
file://libart_lgpl-2.3.21-crosscompile.patch \
"
SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302"
SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"
@@ -18,9 +20,3 @@ FILES_${PN} = "${libdir}/*.so.*"
FILES_${PN}-dev += "${bindir}/libart2-config"
S = "${WORKDIR}/libart_lgpl-${PV}"
do_compile_prepend() {
# enforce regeneration of art_config.h
rm ${S}/art_config.h
}