diff options
Diffstat (limited to 'external/poky/meta/recipes-graphics/xorg-font')
| -rw-r--r-- | external/poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch | 23 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb (renamed from external/poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb) | 7 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb (renamed from external/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb) | 6 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc | 2 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 2 |
5 files changed, 26 insertions, 14 deletions
diff --git a/external/poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/external/poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch index f330c185..ec7c7d80 100644 --- a/external/poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch +++ b/external/poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch @@ -1,23 +1,32 @@ +From b08c43a0842076e0a94e88ad6456a9326cd7ffc9 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Tue, 17 May 2011 23:03:02 +0000 +Subject: [PATCH] Improve handling of 'all' architecture recipes and their + Upstream-Status: Inappropriate [configuration] 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 +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 -Index: encodings-1.0.4/configure.ac -=================================================================== ---- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100 -+++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100 -@@ -4,12 +4,12 @@ +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 622c27b..5ee84ed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.5], + [https://gitlab.freedesktop.org/xorg/font/encodings/issues]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], diff --git a/external/poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/external/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb index 36766f2f..74014ff9 100644 --- a/external/poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb +++ b/external/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb @@ -13,10 +13,13 @@ DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" RDEPENDS_${PN} = "" SRC_URI += "file://nocompiler.patch" +SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a" +SRC_URI[sha256sum] = "bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31" inherit allarch EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" -SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" -SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" +# postinst from .inc doesn't apply to this recipe +pkg_postinst_${PN} () { +} diff --git a/external/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb b/external/poky/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb index 34646ff9..ebe7a603 100644 --- a/external/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb +++ b/external/poky/meta/recipes-graphics/xorg-font/font-util_1.3.2.bb @@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5df208ec65eb84ce5bb8d82d8f3b9675 \ DEPENDS = "encodings util-macros" DEPENDS_class-native = "util-macros-native" RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" -RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" +RDEPENDS_${PN}_class-native = "" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "23756dab809f9ec5011bb27fb2c3c7d6" -SRC_URI[sha256sum] = "aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921" +SRC_URI[md5sum] = "3d6adb76fdd072db8c8fae41b40855e8" +SRC_URI[sha256sum] = "3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282" SYSROOT_DIRS_BLACKLIST_remove = "${datadir}/fonts" diff --git a/external/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/external/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc index cdbebcf7..f18c8aef 100644 --- a/external/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/external/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -14,7 +14,7 @@ INC_PR = "r2" SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # The mkfontscale-native requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" diff --git a/external/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/external/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index 9bcd1b2f..1ea08a6c 100644 --- a/external/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/external/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -13,7 +13,7 @@ SRC_URI = "file://misc" PE = "1" PR = "r2" -inherit allarch distro_features_check +inherit allarch features_check # The font-alias requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" |