summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-01-18 22:29:39 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-01-18 22:29:39 +0000
commit330923d186ef2cae8f55be58c310f34d1583c279 (patch)
treeba75ae5286b2ddb952df6a2e3ba449bc84fbf478
parent14cde5008d7d8296fc3ad65e065d51151fed7f8a (diff)
parentb7381c5b471cf03a33c20e08d9254e6b39b86193 (diff)
merge of '64d61b910321c9ea962004a87927c15c3ba97cc3'
and '9ba44743e0bc03478bbf0e119e8639d484aca41e'
-rw-r--r--packages/g15daemon/g15daemon_1.2.6a.bb8
-rw-r--r--packages/libg15/libg15_1.2.1.bb4
-rw-r--r--packages/libg15render/libg15render_1.2.bb4
3 files changed, 13 insertions, 3 deletions
diff --git a/packages/g15daemon/g15daemon_1.2.6a.bb b/packages/g15daemon/g15daemon_1.2.6a.bb
index 872d61d848..0522b27a28 100644
--- a/packages/g15daemon/g15daemon_1.2.6a.bb
+++ b/packages/g15daemon/g15daemon_1.2.6a.bb
@@ -10,10 +10,16 @@ SECTION = "console/utils"
PRIORITY = "optional"
DEPENDS = "libdaemon libg15"
RDEPENDS = "libg15"
+RRECOMMENDS = "kernel-module-uinput"
+PR="r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/g15daemon/g15daemon-${PV}.tar.bz2"
inherit autotools
-EXTRA_OECONF = "--disable-build-docs"
+EXTRA_OECONF = "--with-gnu-ld"
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb
index 746e5f2e98..62f18c91b0 100644
--- a/packages/libg15/libg15_1.2.1.bb
+++ b/packages/libg15/libg15_1.2.1.bb
@@ -4,12 +4,14 @@ LICENSE = "GPLv2"
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "libusb"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15-${PV}.tar.bz2"
inherit autotools
+EXTRA_OECONF = "--with-gnu-ld"
+
do_stage () {
oe_libinstall -a -so libg15 ${STAGING_LIBDIR}
for i in libg15.h; do
diff --git a/packages/libg15render/libg15render_1.2.bb b/packages/libg15render/libg15render_1.2.bb
index 2adb511eea..055d911633 100644
--- a/packages/libg15render/libg15render_1.2.bb
+++ b/packages/libg15render/libg15render_1.2.bb
@@ -4,12 +4,14 @@ LICENSE = "GPLv2"
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "libg15"
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15render-${PV}.tar.bz2"
inherit autotools
+EXTRA_OECONF = "--with-gnu-ld"
+
do_stage () {
oe_libinstall -a -so libg15render ${STAGING_LIBDIR}
for i in libg15render.h; do