diff options
| author | Philip Balister <philip@balister.org> | 2007-01-10 11:56:54 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-01-10 11:56:54 +0000 |
| commit | ec9b38a8bc554452f2c0fafc83d1e6540e514713 (patch) | |
| tree | f2aedc2fa81ef984667242bec004b5e7bc517522 /packages | |
| parent | f031fb843481eaa4d18e314c8d7b5c55db27a412 (diff) | |
| parent | fdb4c1b611384cd0647887c42b5e9ad66ce96d68 (diff) | |
merge of '8ec6936842d2420f6d2a56139b8385575ba9e27e'
and 'f4b3e06f33fc327501dbed067c7324a3fe7234e3'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ossie/ossie-sigproc_svn.bb | 2 | ||||
| -rw-r--r-- | packages/ossie/ossie-soundout-device_svn.bb | 2 | ||||
| -rw-r--r-- | packages/ossie/ossie-standardinterfaces_svn.bb | 4 | ||||
| -rw-r--r-- | packages/usrp/files/fix_compile_h.patch | 13 | ||||
| -rw-r--r-- | packages/usrp/usrp_0.12.bb | 5 |
5 files changed, 25 insertions, 1 deletions
diff --git a/packages/ossie/ossie-sigproc_svn.bb b/packages/ossie/ossie-sigproc_svn.bb index 5d3643bfde..c8ee73fea5 100644 --- a/packages/ossie/ossie-sigproc_svn.bb +++ b/packages/ossie/ossie-sigproc_svn.bb @@ -15,6 +15,8 @@ inherit autotools pkgconfig EXTRA_OECONF_append_arm = " --enable-fpm=arm" +CXXFLAGS_powerpc = "-lstdc++" + do_stage () { autotools_stage_all } diff --git a/packages/ossie/ossie-soundout-device_svn.bb b/packages/ossie/ossie-soundout-device_svn.bb index 2af60db834..b70d0f91bb 100644 --- a/packages/ossie/ossie-soundout-device_svn.bb +++ b/packages/ossie/ossie-soundout-device_svn.bb @@ -15,6 +15,8 @@ prefix="/home/sca" inherit autotools +EXTRA_OECONF = "--with-omniorb=${STAGING_BINDIR}/.. IDL=${STAGING_BINDIR_NATIVE}/omniidl" + FILES_${PN} += "/home/sca/xml/soundCard/*xml" BROKEN = "1" diff --git a/packages/ossie/ossie-standardinterfaces_svn.bb b/packages/ossie/ossie-standardinterfaces_svn.bb index 7482430ec8..7ed7c0b56f 100644 --- a/packages/ossie/ossie-standardinterfaces_svn.bb +++ b/packages/ossie/ossie-standardinterfaces_svn.bb @@ -13,6 +13,10 @@ SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/standardInterfaces/trunk;module= inherit autotools pkgconfig +EXTRA_OECONF = "--with-omniorb=${STAGING_BINDIR}/.. IDL=${STAGING_BINDIR_NATIVE}/omniidl" + +CXXFLAGS_powerpc += "-lstdc++" + do_stage () { autotools_stage_all } 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}" |