diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-04-29 17:44:34 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-03 11:39:48 +0100 |
| commit | 91f3255ad700736bbf5d1b35b48db1708676a469 (patch) | |
| tree | 9bf5d5a0191860c2c462c1a2c11ba16ce2d10a34 /meta | |
| parent | 1e2fd0a55a523d7e24275da23b801618dd9f82c5 (diff) | |
| download | openembedded-core-91f3255ad700736bbf5d1b35b48db1708676a469.tar.gz openembedded-core-91f3255ad700736bbf5d1b35b48db1708676a469.tar.bz2 openembedded-core-91f3255ad700736bbf5d1b35b48db1708676a469.zip | |
libart_lgpl: Allow art_config.h to be generated at compile time
* Remove patch that prevents the Makefile from generating the
art_config.h file
* Remove pre-generated art_config.h for various architecture
* Add a do_compile prepend to remove the art_config.h that is provided
in the source so that the compilation will regenerate the file
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
17 files changed, 5 insertions, 174 deletions
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch deleted file mode 100644 index 190ba96085..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: libart_lgpl-2.3.21/Makefile.am -=================================================================== ---- libart_lgpl-2.3.21.orig/Makefile.am 2009-04-18 05:29:25.000000000 -0700 -+++ libart_lgpl-2.3.21/Makefile.am 2010-11-23 23:12:32.445450075 -0800 -@@ -7,8 +7,8 @@ - - BUILT_SOURCES = art_config.h - --art_config.h: -- ./gen_art_config.sh > art_config.h -+#art_config.h: -+# ./gen_art_config.sh > art_config.h - - EXTRA_DIST = \ - libart.def \ diff --git a/meta/recipes-gnome/gnome/libart-lgpl/aarch64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/aarch64/art_config.h deleted file mode 100644 index 500ffc38f1..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/aarch64/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 8 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/aarch64be/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/aarch64be/art_config.h deleted file mode 100644 index 500ffc38f1..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/aarch64be/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 8 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/aarch64be_32/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/aarch64be_32/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/aarch64be_32/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/armeb/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/armeb/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/armeb/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mips/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mips/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/mips/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mips64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mips64/art_config.h deleted file mode 100644 index d10cd957d5..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/mips64/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 8 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mips64el/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mips64el/art_config.h deleted file mode 100644 index d10cd957d5..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/mips64el/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 8 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/mipsel/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/mipsel/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/mipsel/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/powerpc/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/powerpc/art_config.h deleted file mode 100644 index b0e74ad6ae..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/powerpc/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 4 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h deleted file mode 100644 index 500ffc38f1..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 8 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; diff --git a/meta/recipes-gnome/gnome/libart-lgpl/x86_64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/x86_64/art_config.h deleted file mode 100644 index 500ffc38f1..0000000000 --- a/meta/recipes-gnome/gnome/libart-lgpl/x86_64/art_config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Automatically generated by gen_art_config.c */ - -#define ART_SIZEOF_CHAR 1 -#define ART_SIZEOF_SHORT 2 -#define ART_SIZEOF_INT 4 -#define ART_SIZEOF_LONG 8 - -typedef unsigned char art_u8; -typedef unsigned short art_u16; -typedef unsigned int art_u32; 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 4966ea4c7a..138461684c 100644 --- a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb +++ b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb @@ -4,12 +4,8 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" PR = "r2" -ART_CONFIG = "${HOST_ARCH}/art_config.h" - # can't use gnome.oeclass due to _ in filename -SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ - file://${ART_CONFIG} \ - file://Makefile.am.patch" +SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2" SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302" SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa" @@ -23,6 +19,8 @@ FILES_${PN}-dev += "${bindir}/libart2-config" S = "${WORKDIR}/libart_lgpl-${PV}" -do_configure_prepend() { - cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h +do_compile_prepend() { + # enforce regeneration of art_config.h + rm ${S}/art_config.h } + |