diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-17 16:15:38 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-17 19:45:42 +0200 |
| commit | 11549e58097f9dda730bb142da768c897fbbc5ae (patch) | |
| tree | 2d6c5aa32e5b32b84cc2d4202de45203abf04795 | |
| parent | e7463a7b8606fd0f514f9b477bd33ed40f4f9157 (diff) | |
| download | meta-openembedded-11549e58097f9dda730bb142da768c897fbbc5ae.tar.gz | |
uhd: fix build, update SRCREV
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
3 files changed, 31 insertions, 3 deletions
diff --git a/meta-oe/recipes-connectivity/uhd/uhd.inc b/meta-oe/recipes-connectivity/uhd/uhd.inc index d2ffb848fb..e6a71bc26f 100644 --- a/meta-oe/recipes-connectivity/uhd/uhd.inc +++ b/meta-oe/recipes-connectivity/uhd/uhd.inc @@ -1,6 +1,7 @@ DESCRIPTION = "Universal Hardware Driver for Ettus Research products." HOMEPAGE = "http://www.ettus.com" LICENSE = "GPLV3+" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=51b35d652c070d136bf20244494be2d3" DEPENDS = "git-native python-cheetah-native boost libusb1 uhd-firmware" RDEPENDS_${PN} += "uhd-firmware" diff --git a/meta-oe/recipes-connectivity/uhd/uhd/0001-HACK-work-around-Wl-as-needed-problems.patch b/meta-oe/recipes-connectivity/uhd/uhd/0001-HACK-work-around-Wl-as-needed-problems.patch new file mode 100644 index 0000000000..2bce7c388c --- /dev/null +++ b/meta-oe/recipes-connectivity/uhd/uhd/0001-HACK-work-around-Wl-as-needed-problems.patch @@ -0,0 +1,26 @@ +From e5d7ae406cb7770c4fe4886bd162c18bf6ca2904 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Fri, 17 Jun 2011 19:44:04 +0200 +Subject: [PATCH] HACK: work around -Wl,as-needed problems + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + host/lib/types/CMakeLists.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt +index 957dfd3..3147747 100644 +--- a/host/lib/types/CMakeLists.txt ++++ b/host/lib/types/CMakeLists.txt +@@ -59,7 +59,7 @@ CHECK_CXX_SOURCE_COMPILES(" + IF(HAVE_CLOCK_GETTIME) + MESSAGE(STATUS " High resolution timing supported through clock_gettime.") + SET(TIME_SPEC_DEFS HAVE_CLOCK_GETTIME) +- LIBUHD_APPEND_LIBS("-lrt") ++ LIBUHD_APPEND_LIBS("-lrt -lpthread -lncurses") + ELSEIF(HAVE_MACH_ABSOLUTE_TIME) + MESSAGE(STATUS " High resolution timing supported through mach_absolute_time.") + SET(TIME_SPEC_DEFS HAVE_MACH_ABSOLUTE_TIME) +-- +1.6.6.1 + diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb index d1c936d001..68a485e7e3 100644 --- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb +++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb @@ -1,8 +1,9 @@ require uhd.inc -PR = "${INC_PR}.2" +PR = "${INC_PR}.4" -SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git" +SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;protocol=git \ + file://0001-HACK-work-around-Wl-as-needed-problems.patch" S = "${WORKDIR}/git/host" -SRCREV = "cc639e876f326e958dace8438ae41b8cd9563780" +SRCREV = "0aff497dacc9cc4eba5d800cc46343da083cfdf1" |