[oe] [PATCH] encodings/font-util: swapped inter-DEPENDS
John Willis
John.Willis at Distant-earth.com
Fri Jun 4 19:27:07 UTC 2010
> 'encodings' uses font-util's pkg-config file to determine location of the
X11
> font directory. When 'font-util' is not staged yet (as it was the case),
it will
> use buildhost information which point to something like /usr/share/X11
> (which is outside of the staging dir) and which are not writable.
>
> This results into an empty 'encodings' package on first bitbake run in a
> pristine tree; 'encodings' must be rebuilt so that it can use font-util
> information from previous runs.
>
> As 'font-util' itself does not require 'encodings' during build-time,
there were
> swapped the DEPENDS.
>
> Signed-off-by: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
> Cc: David-John Willis <John.Willis at Distant-earth.com>
> Cc: Martin Jansa <Martin.Jansa at gmail.com>
Acked-by: David-John Willis <John.Willis at Distant-earth.com>
> ---
> recipes/xorg-font/encodings_1.0.3.bb | 4 ++--
> recipes/xorg-font/font-util_1.1.1.bb | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/recipes/xorg-font/encodings_1.0.3.bb b/recipes/xorg-
> font/encodings_1.0.3.bb
> index 168a67a..bc95836 100644
> --- a/recipes/xorg-font/encodings_1.0.3.bb
> +++ b/recipes/xorg-font/encodings_1.0.3.bb
> @@ -1,8 +1,8 @@
> require xorg-font-common.inc
> PE = "1"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>
> -DEPENDS = "mkfontscale-native font-util-native"
> +DEPENDS = "mkfontscale-native font-util-native font-util"
>
> SRC_URI[archive.md5sum] = "29637480e7ce12546668631067c19ced"
> SRC_URI[archive.sha256sum] =
> "07d9766d4aebe05ac572599f8f903a4fe06ab667a8182f2b6cc03e5fb3b80f53"
> diff --git a/recipes/xorg-font/font-util_1.1.1.bb
b/recipes/xorg-font/font-
> util_1.1.1.bb
> index f42b505..3f9b4c8 100644
> --- a/recipes/xorg-font/font-util_1.1.1.bb
> +++ b/recipes/xorg-font/font-util_1.1.1.bb
> @@ -4,11 +4,11 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
>
> DESCRIPTION = "X font utils."
>
> -DEPENDS = "encodings util-macros"
> +DEPENDS = "util-macros"
> RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
>
> PE = "1"
> -PR = "${INC_PR}.1"
> +PR = "${INC_PR}.2"
>
> do_configure_prepend() {
> sed -i "s#MAPFILES_PATH=\`pkg-
> config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATI
> VE}/pkg-config\" pkg-config#g" fontutil.m4.in
> --
> 1.7.0.1
More information about the Openembedded-devel
mailing list