summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-05 18:11:08 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:26 +0000
commit03ed0dbcaeb2ded214c36bf3e4504106e7b9d6fa (patch)
tree1bc4857375018e5ac8556db00f482d59c17806ba
parent4523bc1bef2418971a92188f5905f7843e671d0d (diff)
downloadpoky-03ed0dbcaeb2ded214c36bf3e4504106e7b9d6fa.tar.gz
xcb-proto: Drop custom staging function
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/xcb/xcb-proto.inc10
-rw-r--r--meta/packages/xcb/xcb-proto_1.2.bb2
-rw-r--r--meta/packages/xcb/xcb-proto_git.bb4
3 files changed, 1 insertions, 15 deletions
diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/packages/xcb/xcb-proto.inc
index 2d2f8b776f..b294d1ac55 100644
--- a/meta/packages/xcb/xcb-proto.inc
+++ b/meta/packages/xcb/xcb-proto.inc
@@ -5,17 +5,9 @@ HOMEPAGE = "http://xcb.freedesktop.org"
5 5
6SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" 6SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
7 7
8inherit autotools pkgconfig 8inherit autotools_stage pkgconfig
9 9
10FILES_${PN}-dev += "${datadir}/xcb/*.xml" 10FILES_${PN}-dev += "${datadir}/xcb/*.xml"
11 11
12do_stage() {
13 oe_runmake DESTDIR="${D}" install
14 mkdir -p ${STAGING_LIBDIR}/pkgconfig
15 install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig
16 mkdir -p ${STAGING_DATADIR}/xcb
17 install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb
18}
19
20RDEPENDS_${PN}-dev = "" 12RDEPENDS_${PN}-dev = ""
21RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" 13RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
diff --git a/meta/packages/xcb/xcb-proto_1.2.bb b/meta/packages/xcb/xcb-proto_1.2.bb
deleted file mode 100644
index e602252d92..0000000000
--- a/meta/packages/xcb/xcb-proto_1.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1include xcb-proto.inc
2PR = "r1"
diff --git a/meta/packages/xcb/xcb-proto_git.bb b/meta/packages/xcb/xcb-proto_git.bb
index 8b5981b739..6eaa0dd278 100644
--- a/meta/packages/xcb/xcb-proto_git.bb
+++ b/meta/packages/xcb/xcb-proto_git.bb
@@ -6,9 +6,5 @@ PV = "1.2+gitr${SRCREV}"
6SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git" 6SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git"
7S = "${WORKDIR}/git" 7S = "${WORKDIR}/git"
8 8
9do_stage() {
10 autotools_stage_all
11}
12
13DEPENDS_append_virtclass-native = " python-native" 9DEPENDS_append_virtclass-native = " python-native"
14BBCLASSEXTEND = "native" 10BBCLASSEXTEND = "native"