[oe-commits] Enrico Scholz : encodings/font-util: swapped inter-DEPENDS

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c1968dc5ea6b0552a8ca2c9c38c51c5df0ae4917
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c1968dc5ea6b0552a8ca2c9c38c51c5df0ae4917

Author: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Date:   Thu May 27 15:14:53 2010 +0200

encodings/font-util: swapped inter-DEPENDS

'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>

---

 recipes/xorg-font/encodings_1.0.3.bb |    4 ++--
 recipes/xorg-font/font-util_1.1.1.bb |    2 +-
 2 files changed, 3 insertions(+), 3 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 bb8a0f9..3f9b4c8 100644
--- a/recipes/xorg-font/font-util_1.1.1.bb
+++ b/recipes/xorg-font/font-util_1.1.1.bb
@@ -4,7 +4,7 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 
 DESCRIPTION = "X font utils."
 
-DEPENDS = "encodings util-macros"
+DEPENDS = "util-macros"
 RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
 
 PE = "1"