Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/21 14:36:00-05:00 handhelds.org!kergoth
Apply patch to fix libxi build with automake 1.9.x.

BKrev: 41f15a9aMYw8UDayX3rPiiiEBpMzZQ

diff --git a/packages/libxi/files/autofoo.patch b/packages/libxi/files/autofoo.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/libxi/libxi_6.0.1.bb b/packages/libxi/libxi_6.0.1.bb
index e69de29..fae7255 100644 (file)
--- a/packages/libxi/libxi_6.0.1.bb
+++ b/packages/libxi/libxi_6.0.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "X Input Extension library"
+SECTION = "x11/libs"
+DEPENDS = "xproto x11 xextensions"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
+          file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXi-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR}
+}
+

diff --git a/packages/libxi/libxi_cvs.bb b/packages/libxi/libxi_cvs.bb
index e69de29..80955c7 100644 (file)
--- a/packages/libxi/libxi_cvs.bb
+++ b/packages/libxi/libxi_cvs.bb
@@ -0,0 +1,20 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "x11/libs"
+DEPENDS = "xproto x11 xextensions"
+DESCRIPTION = "X Input extension library."
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xi \
+          file://autofoo.patch;patch=1"
+S = "${WORKDIR}/Xi"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR} \
+              mandir=${STAGING_DATADIR}/man
+}