# HG changeset patch # User Pascal Bellard # Date 1555939002 -7200 # Node ID 002dece9cd289d42144f53b1e257e650f38835af # Parent 3cc017536dfc21dd6fab25c8c1f906a02f586d4b uhd: fix build diff -r 3cc017536dfc -r 002dece9cd28 syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Mon Apr 22 14:09:55 2019 +0100 +++ b/syslinux/stuff/iso2exe/init Mon Apr 22 15:16:42 2019 +0200 @@ -1039,7 +1039,7 @@ mount -o loop,ro -t squashfs /rootfs*.gz /sqfs fi ln -s /sqfs/lib/* lib - ln -s /sqfs/usr /sqfs/var / + ln -fs /sqfs/usr /sqfs/var / for i in dmesg basename tr od reboot poweroff getty sync which md5sum \ $(/sqfs/bin/busybox --list 2> /dev/null); do [ -x /bin/$i ] || ln -s /sqfs/bin/busybox /bin/$i diff -r 3cc017536dfc -r 002dece9cd28 uhd/receipt --- a/uhd/receipt Mon Apr 22 14:09:55 2019 +0100 +++ b/uhd/receipt Mon Apr 22 15:16:42 2019 +0200 @@ -21,6 +21,13 @@ # Rules to configure and make the package. compile_rules() { + sed -i 's|native(|native_handle(|' host/lib/transport/*.cpp \ + host/examples/*.cpp + sed -i 's|timeout \* 1000.0|long(&)|' host/lib/usrp/x300/x300_impl.cpp + sed -i 's|\(milliseconds\)\(.*\);|\1(long\2);|' \ + host/examples/tx_samples_from_file.cpp + sed -i 's|\(:seconds\)\(.*\))|\1(long\2))|' \ + host/examples/rx_samples_to_file.cpp export LDFLAGS="$LDFLAGS -ltinfo" cd $src/host mkdir build diff -r 3cc017536dfc -r 002dece9cd28 warzone2100/receipt --- a/warzone2100/receipt Mon Apr 22 14:09:55 2019 +0100 +++ b/warzone2100/receipt Mon Apr 22 15:16:42 2019 +0200 @@ -19,7 +19,7 @@ # Rules to configure and make the package. compile_rules() { - cd $src + export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lvorbis" ./configure \ --disable-motif \ $CONFIGURE_ARGS && @@ -35,4 +35,3 @@ cp -a $install/usr/share/icons/warzone2100.png $fs/usr/share/pixmaps cp -a $install/usr/share/warzone2100 $fs/usr/share } -