summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-font
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-font')
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-font-common.inc6
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb5
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
index d3b995a358..d5267f59a2 100644
--- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc
+++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc
@@ -10,10 +10,14 @@ RDEPENDS_${PN} = "encodings font-util font-alias"
10XORG_PN = "${BPN}" 10XORG_PN = "${BPN}"
11INC_PR = "r2" 11INC_PR = "r2"
12 12
13
13SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" 14SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
14S = "${WORKDIR}/${XORG_PN}-${PV}" 15S = "${WORKDIR}/${XORG_PN}-${PV}"
15 16
16inherit autotools pkgconfig 17inherit autotools pkgconfig distro_features_check
18
19# The mkfontscale-native requires x11 in DISTRO_FEATURES
20REQUIRED_DISTRO_FEATURES = "x11"
17 21
18EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" 22EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)"
19 23
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index bee500b43a..9bcd1b2fa6 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -13,7 +13,10 @@ SRC_URI = "file://misc"
13PE = "1" 13PE = "1"
14PR = "r2" 14PR = "r2"
15 15
16inherit allarch 16inherit allarch distro_features_check
17
18# The font-alias requires x11 in DISTRO_FEATURES
19REQUIRED_DISTRO_FEATURES = "x11"
17 20
18S = "${WORKDIR}/misc" 21S = "${WORKDIR}/misc"
19 22