summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-29 19:30:37 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-29 19:30:37 +0000
commitfc0687500a670a3f59d56ae01bf9aa140ef75244 (patch)
tree8a4c77878da0fd40671f87a34f0c455e68a2e4ee
parent3081d60d5a9f8accf016bd43f0ef13dffa9a519b (diff)
downloadopenembedded-core-fc0687500a670a3f59d56ae01bf9aa140ef75244.tar.gz
libxcb.inc: Fix bogus reference to STAGING_DIR/HOST_SYS
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5321 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xcb/libxcb.inc2
-rw-r--r--meta/packages/xcb/libxcb_1.0.bb2
-rw-r--r--meta/packages/xcb/libxcb_git.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/xcb/libxcb.inc b/meta/packages/xcb/libxcb.inc
index 99356a1eb0..bdce8a2e6b 100644
--- a/meta/packages/xcb/libxcb.inc
+++ b/meta/packages/xcb/libxcb.inc
@@ -46,7 +46,7 @@ inherit autotools pkgconfig
# but the xcbincludedir variable doesn't point into the staging area, so it needs some
# tweeking here:
do_configure_prepend () {
- sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR}/${HOST_SYS}/|" \
+ sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/|" \
${S}/configure.ac
}
diff --git a/meta/packages/xcb/libxcb_1.0.bb b/meta/packages/xcb/libxcb_1.0.bb
index dd88a5390f..2e97a34cde 100644
--- a/meta/packages/xcb/libxcb_1.0.bb
+++ b/meta/packages/xcb/libxcb_1.0.bb
@@ -1,5 +1,5 @@
include libxcb.inc
-PR = "r0"
+PR = "r1"
DEPENDS += "libpthread-stubs"
diff --git a/meta/packages/xcb/libxcb_git.bb b/meta/packages/xcb/libxcb_git.bb
index cb7326efa0..a7707b3507 100644
--- a/meta/packages/xcb/libxcb_git.bb
+++ b/meta/packages/xcb/libxcb_git.bb
@@ -2,7 +2,7 @@ DEFAULT_PREFERENCE = "-1"
include libxcb.inc
PV = "1.0+git"
-PR = "r0"
+PR = "r1"
DEPENDS += "libpthread-stubs"