summaryrefslogtreecommitdiff
path: root/packages/xorg-font
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-08-24 16:22:34 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-08-24 16:22:34 +0000
commit2a3a5812f4a2752fefc847d65d0a1b3ede3f0b4f (patch)
tree1dda9bd3851af800b7068aec253b34c84ba1c8be /packages/xorg-font
parent48546b8dbfc9bd50e1c4057b90d5765fbbe86fd4 (diff)
parent78a23dcea5d5b9b124e66afaffcebef37726769c (diff)
merge of '83199e5f8013253895f505392eddf036d9242fd1'
and 'dd12cf1614fbdd04c9791735ee944b266f1c6c74'
Diffstat (limited to 'packages/xorg-font')
-rw-r--r--packages/xorg-font/font-util_1.0.1.bb2
-rw-r--r--packages/xorg-font/xfonts-xorg_6.8.bb2
-rw-r--r--packages/xorg-font/xorg-font-common.inc2
3 files changed, 6 insertions, 0 deletions
diff --git a/packages/xorg-font/font-util_1.0.1.bb b/packages/xorg-font/font-util_1.0.1.bb
index 915c40cd5c..3ba1c05a29 100644
--- a/packages/xorg-font/font-util_1.0.1.bb
+++ b/packages/xorg-font/font-util_1.0.1.bb
@@ -1,5 +1,7 @@
require xorg-font-common.inc
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
DESCRIPTION = "X font utils."
DEPENDS = "encodings"
diff --git a/packages/xorg-font/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb
index f8a6a76964..78068e0534 100644
--- a/packages/xorg-font/xfonts-xorg_6.8.bb
+++ b/packages/xorg-font/xfonts-xorg_6.8.bb
@@ -3,6 +3,8 @@ PR = "r1"
# XXX Is this true? These fonts are from X.org.
LICENSE = "XFree86"
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
file://lexer.patch;patch=1"
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
index c2977c8db9..09489b1cf8 100644
--- a/packages/xorg-font/xorg-font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -22,6 +22,8 @@ do_stage() {
autotools_stage_all
}
+PACKAGE_ARCH = "all"
+
pkg_postinst_${PN} () {
set -x
for fontdir in `find $D/usr/lib/X11/fonts -type d`; do