diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-07 15:13:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-10 10:00:07 +0100 |
| commit | 639f138c3d2feff965e752cdb07c43bdfe415233 (patch) | |
| tree | e58e8e04b50e1756dc6d5d58050d51ab8176bba5 /meta/recipes-graphics/xorg-font | |
| parent | 80c844f3c6c7eaa3e35d39d058e3e0cdb64f8d6a (diff) | |
| download | openembedded-core-contrib-639f138c3d2feff965e752cdb07c43bdfe415233.tar.gz | |
font-alias: Convert to use allarch including a patch to disable compiler checks
(From OE-Core rev: b0c111fd15be671be77ce886e28c05835f159ce6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-font')
| -rw-r--r-- | meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 10 |
2 files changed, 36 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch new file mode 100644 index 0000000000..48e183ce3c --- /dev/null +++ b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch @@ -0,0 +1,30 @@ +XORG_DEFAULT_OPTIONS pulls in the following dependency chains: + +XORG_CWARNFLAGS -> AC_PROG_CC_C99 +XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS +XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host + +each of which triggers the use of the host compiler. As an "all" +architecture package, it shouldn't need a compiler (and doesn't). + +RP 17/5/2011 + +diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac +--- font-alias-1.0.3.orig//configure.ac 2011-05-18 21:29:18.378258643 +0200 ++++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200 +@@ -28,12 +28,12 @@ + AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_MAINTAINER_MODE + +-# Require xorg-macros: XORG_DEFAULT_OPTIONS + m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) + XORG_MACROS_VERSION(1.3) +-XORG_DEFAULT_OPTIONS +- ++XORG_RELEASE_VERSION ++XORG_CHANGELOG ++XORG_INSTALL + AC_PROG_INSTALL + + XORG_FONTROOTDIR diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb index 1b639614cb..700529190e 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb @@ -9,14 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \ file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \ file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb" -DEPENDS = "virtual/xserver font-util" +SRC_URI += "file://nocompiler.patch" + +DEPENDS = "util-macros-native" RDEPENDS_${PN} = "encodings font-util" RDEPENDS_${PN}_virtclass-native = "font-util-native" -PE = "1" -PR = "${INC_PR}.1" +inherit allarch -PACKAGE_ARCH = "all" +PE = "1" +PR = "${INC_PR}.2" SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" |