summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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"
SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
FILES_${PN}-dev += "${datadir}/xcb/*.xml"
-do_stage() {
- oe_runmake DESTDIR="${D}" install
- mkdir -p ${STAGING_LIBDIR}/pkgconfig
- install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig
- mkdir -p ${STAGING_DATADIR}/xcb
- install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb
-}
-
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${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 @@
-include xcb-proto.inc
-PR = "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}"
SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git"
S = "${WORKDIR}/git"
-do_stage() {
- autotools_stage_all
-}
-
DEPENDS_append_virtclass-native = " python-native"
BBCLASSEXTEND = "native"