diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-10 14:18:19 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-10 14:18:19 +0000 |
| commit | 1568be1da70dbee3a4033cd274bc85d9dfa60d0c (patch) | |
| tree | 08c7f86781226554900aea9d36b6563c30d7d466 /packages/usrp | |
| parent | 9d2a68aadee35b8e3cc37597a50c7116057932fe (diff) | |
| parent | a958b7df1dd716b5716051485d215a7405b6afee (diff) | |
merge of '085fdb053bd524c93d21f1f230ab0b9ae7e0143f'
and 'a0e35a653641856b7a032c32949f7d3b2c23b5af'
Diffstat (limited to 'packages/usrp')
| -rw-r--r-- | packages/usrp/files/fix_compile_h.patch | 13 | ||||
| -rw-r--r-- | packages/usrp/usrp_0.12.bb | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/packages/usrp/files/fix_compile_h.patch b/packages/usrp/files/fix_compile_h.patch new file mode 100644 index 0000000000..02ba7e44a0 --- /dev/null +++ b/packages/usrp/files/fix_compile_h.patch @@ -0,0 +1,13 @@ +Index: gnuradio/trunk/usrp/host/lib/fusb_linux.cc +=================================================================== +--- gnuradio/trunk/usrp/host/lib/fusb_linux.cc (revision 3534) ++++ gnuradio/trunk/usrp/host/lib/fusb_linux.cc (revision 3886) +@@ -28,5 +28,7 @@ + #include <usb.h> // libusb header + #include <stdexcept> ++#ifdef HAVE_LINUX_COMPILER_H + #include <linux/compiler.h> ++#endif + #include <linux/usbdevice_fs.h> // interface to kernel portion of user mode usb driver + #include <sys/ioctl.h> + diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb index 5fc6969f8c..ade37baf60 100644 --- a/packages/usrp/usrp_0.12.bb +++ b/packages/usrp/usrp_0.12.bb @@ -7,13 +7,16 @@ RDEPENDS = "python-core" PR = "r0" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \ - file://usb11.patch;patch=1" \ + file://usb11.patch;patch=1 \ + file://fix_compile_h.patch;patch=1;pnum=3 \ file://install_test.patch;patch=1" S = "${WORKDIR}/usrp-${PV}" inherit autotools pkgconfig +CXXFLAGS_powerpc += "-lstdc++" + export BUILD_SYS := "${BUILD_SYS}" export HOST_SYS := "${HOST_SYS}" |