summaryrefslogtreecommitdiff
path: root/dbus
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-03-22 22:37:29 +0000
committerChris Larson <clarson@kergoth.com>2004-03-22 22:37:29 +0000
commitf249735ad71fd5f13bfd295c55e1e0d596a1dbff (patch)
tree93735f3e25beab7ac8bf066c504df17b244db4eb /dbus
parent11ebfcef190cf217f67fa2b79adee0f58f9718f3 (diff)
Another pass of .oe cleanups.
BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus_0.20.oe16
-rw-r--r--dbus/dbus_0.21.oe36
2 files changed, 42 insertions, 10 deletions
diff --git a/dbus/dbus_0.20.oe b/dbus/dbus_0.20.oe
index c20bb38346..1f626d1587 100644
--- a/dbus/dbus_0.20.oe
+++ b/dbus/dbus_0.20.oe
@@ -3,14 +3,14 @@ DESCRIPTION = "message bus system for applications to talk to one another"
DEPENDS = "virtual/libc expat glib-2.0"
RDEPENDS = "libc6 expat"
-SRC_URI = 'http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
- file://${FILESDIR}/cross.patch;patch=1'
+SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
+ file://${FILESDIR}/cross.patch;patch=1"
inherit autotools libtool pkgconfig
-EXTRA_OECONF = '--disable-qt --disable-gtk --disable-tests \
+EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
--disable-checks --disable-xml-docs --disable-doxygen-docs \
- --with-xml=expat --without-x'
+ --with-xml=expat --without-x"
headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h"
@@ -18,14 +18,10 @@ libname = "libdbus-1.so.0.0.0"
glibname = "libdbus-glib-1.so.0.0.0"
do_stage () {
- install -m 0755 dbus/.libs/${libname} ${STAGING_LIBDIR}/
- ln -sf ${libname} ${STAGING_LIBDIR}/libdbus-1.so.0
- ln -sf ${libname} ${STAGING_LIBDIR}/libdbus-1.so
+ oe_soinstall dbus/.libs/${libname} ${STAGING_LIBDIR}/
install -m 0644 dbus/libdbus-1.la ${STAGING_LIBDIR}/
- install -m 0755 glib/.libs/${glibname} ${STAGING_LIBDIR}/
- ln -sf ${glibname} ${STAGING_LIBDIR}/libdbus-glib-1.so.0
- ln -sf ${glibname} ${STAGING_LIBDIR}/libdbus-glib-1.so
+ oe_soinstall glib/.libs/${glibname} ${STAGING_LIBDIR}/
install -m 0644 glib/libdbus-glib-1.la ${STAGING_LIBDIR}/
mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
diff --git a/dbus/dbus_0.21.oe b/dbus/dbus_0.21.oe
index e69de29bb2..1f626d1587 100644
--- a/dbus/dbus_0.21.oe
+++ b/dbus/dbus_0.21.oe
@@ -0,0 +1,36 @@
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+DEPENDS = "virtual/libc expat glib-2.0"
+RDEPENDS = "libc6 expat"
+
+SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
+ file://${FILESDIR}/cross.patch;patch=1"
+
+inherit autotools libtool pkgconfig
+
+EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
+ --disable-checks --disable-xml-docs --disable-doxygen-docs \
+ --with-xml=expat --without-x"
+
+headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h"
+
+libname = "libdbus-1.so.0.0.0"
+glibname = "libdbus-glib-1.so.0.0.0"
+
+do_stage () {
+ oe_soinstall dbus/.libs/${libname} ${STAGING_LIBDIR}/
+ install -m 0644 dbus/libdbus-1.la ${STAGING_LIBDIR}/
+
+ oe_soinstall glib/.libs/${glibname} ${STAGING_LIBDIR}/
+ install -m 0644 glib/libdbus-glib-1.la ${STAGING_LIBDIR}/
+
+ mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
+ for i in ${headers}; do
+ install -m 0644 dbus/$i ${STAGING_INCDIR}/dbus-1.0/dbus/$i
+ done
+
+ install -m 0644 glib/dbus-glib.h ${STAGING_INCDIR}/dbus-1.0/dbus/
+
+ mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+ install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}