wok-6.x rev 21386

uhd: fix build
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Apr 22 15:16:42 2019 +0200 (2019-04-22)
parents 3cc017536dfc
children 8562189da363
files syslinux/stuff/iso2exe/init uhd/receipt warzone2100/receipt
line diff
     1.1 --- a/syslinux/stuff/iso2exe/init	Mon Apr 22 14:09:55 2019 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/init	Mon Apr 22 15:16:42 2019 +0200
     1.3 @@ -1039,7 +1039,7 @@
     1.4  		mount -o loop,ro -t squashfs /rootfs*.gz /sqfs
     1.5  	fi
     1.6  	ln -s /sqfs/lib/* lib
     1.7 -	ln -s /sqfs/usr /sqfs/var /
     1.8 +	ln -fs /sqfs/usr /sqfs/var /
     1.9  	for i in dmesg basename tr od reboot poweroff getty sync which md5sum \
    1.10  	   $(/sqfs/bin/busybox --list 2> /dev/null); do
    1.11  		[ -x /bin/$i ] || ln -s /sqfs/bin/busybox /bin/$i
     2.1 --- a/uhd/receipt	Mon Apr 22 14:09:55 2019 +0100
     2.2 +++ b/uhd/receipt	Mon Apr 22 15:16:42 2019 +0200
     2.3 @@ -21,6 +21,13 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 +	sed -i 's|native(|native_handle(|' host/lib/transport/*.cpp \
     2.8 +		host/examples/*.cpp
     2.9 +	sed -i 's|timeout \* 1000.0|long(&)|' host/lib/usrp/x300/x300_impl.cpp
    2.10 +	sed -i 's|\(milliseconds\)\(.*\);|\1(long\2);|' \
    2.11 +		host/examples/tx_samples_from_file.cpp
    2.12 +	sed -i 's|\(:seconds\)\(.*\))|\1(long\2))|' \
    2.13 +		host/examples/rx_samples_to_file.cpp
    2.14  	export LDFLAGS="$LDFLAGS -ltinfo"
    2.15  	cd $src/host
    2.16  	mkdir build
     3.1 --- a/warzone2100/receipt	Mon Apr 22 14:09:55 2019 +0100
     3.2 +++ b/warzone2100/receipt	Mon Apr 22 15:16:42 2019 +0200
     3.3 @@ -19,7 +19,7 @@
     3.4  # Rules to configure and make the package.
     3.5  compile_rules()
     3.6  {
     3.7 -	cd $src
     3.8 +	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lvorbis"
     3.9  	./configure \
    3.10  		--disable-motif \
    3.11  		$CONFIGURE_ARGS &&
    3.12 @@ -35,4 +35,3 @@
    3.13  	cp -a $install/usr/share/icons/warzone2100.png $fs/usr/share/pixmaps
    3.14  	cp -a $install/usr/share/warzone2100 $fs/usr/share
    3.15  }
    3.16 -