diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-font')
-rw-r--r-- | meta/recipes-graphics/xorg-font/encodings/nocompiler.patch | 31 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/encodings_1.0.4.bb | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 5 |
3 files changed, 39 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch new file mode 100644 index 0000000000..1cddd102f5 --- /dev/null +++ b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | XORG_DEFAULT_OPTIONS pulls in the following dependency chains: | ||
2 | |||
3 | XORG_CWARNFLAGS -> AC_PROG_CC_C99 | ||
4 | XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS | ||
5 | XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host | ||
6 | |||
7 | each of which triggers the use of the host compiler. As an "all" | ||
8 | architecture package, it shouldn't need a compiler (and doesn't). | ||
9 | |||
10 | RP 17/5/2011 | ||
11 | |||
12 | Index: encodings-1.0.4/configure.ac | ||
13 | =================================================================== | ||
14 | --- encodings-1.0.4.orig/configure.ac 2011-05-17 23:36:19.505095876 +0100 | ||
15 | +++ encodings-1.0.4/configure.ac 2011-05-17 23:54:14.935096128 +0100 | ||
16 | @@ -4,12 +4,12 @@ | ||
17 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | ||
18 | AM_MAINTAINER_MODE | ||
19 | |||
20 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS | ||
21 | m4_ifndef([XORG_MACROS_VERSION], | ||
22 | [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) | ||
23 | XORG_MACROS_VERSION(1.3) | ||
24 | -XORG_DEFAULT_OPTIONS | ||
25 | - | ||
26 | +XORG_RELEASE_VERSION | ||
27 | +XORG_CHANGELOG | ||
28 | +XORG_INSTALL | ||
29 | AC_PROG_INSTALL | ||
30 | |||
31 | # Require X.Org's font util macros 1.2 or later | ||
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb index 1345134432..cf7b3e3609 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb | |||
@@ -7,13 +7,15 @@ require xorg-font-common.inc | |||
7 | LICENSE = "PD" | 7 | LICENSE = "PD" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" |
9 | PE = "1" | 9 | PE = "1" |
10 | PR = "${INC_PR}.0" | 10 | PR = "${INC_PR}.1" |
11 | 11 | ||
12 | DEPENDS = "mkfontscale-native font-util-native" | 12 | DEPENDS = "mkfontscale-native font-util-native" |
13 | 13 | ||
14 | EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" | 14 | SRC_URI += "file://nocompiler.patch" |
15 | |||
16 | inherit allarch | ||
15 | 17 | ||
16 | PACKAGE_ARCH = "all" | 18 | EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" |
17 | 19 | ||
18 | SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" | 20 | SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" |
19 | SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" | 21 | SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" |
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index f1e8648e08..b1a65e7b85 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | |||
@@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = "file://../misc/fonts.alias;md5=bbe8d3c0e4e74af96e3ac393985c4 | |||
13 | SRC_URI = "file://misc" | 13 | SRC_URI = "file://misc" |
14 | 14 | ||
15 | PE = "1" | 15 | PE = "1" |
16 | PR = "r0" | 16 | PR = "r1" |
17 | |||
18 | inherit allarch | ||
17 | 19 | ||
18 | PACKAGES = "${PN}" | 20 | PACKAGES = "${PN}" |
19 | PACKAGE_ARCH = "all" | ||
20 | FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" | 21 | FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" |
21 | 22 | ||
22 | do_install() { | 23 | do_install() { |