wok-current rev 21377
razorqt, rrdtool: fix build
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Apr 22 10:58:42 2019 +0200 (2019-04-22) |
parents | 962e35289c91 |
children | b8a0201a8b10 |
files | razorqt/receipt rrdtool/receipt syslinux/stuff/iso2exe/init |
line diff
1.1 --- a/razorqt/receipt Mon Apr 22 09:48:23 2019 +0100 1.2 +++ b/razorqt/receipt Mon Apr 22 10:58:42 2019 +0200 1.3 @@ -23,6 +23,13 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 + sed -i 's|sg_init()|sg_init(1)|' \ 1.8 + razorqt-panel/plugin-networkmonitor/razornetworkmonitor.cpp \ 1.9 + razorqt-panel/plugin-cpuload/razorcpuload.cpp 1.10 + sed -i 's|sg_get_cpu_percents()|sg_get_cpu_percents(NULL)|' \ 1.11 + razorqt-panel/plugin-cpuload/razorcpuload.cpp 1.12 + sed -i 's|int \(.*num_network_stats\)|size_t \1|' \ 1.13 + razorqt-panel/plugin-networkmonitor/razornetworkmonitor.cpp 1.14 cmake -DCMAKE_INSTALL_PREFIX=/usr . 1.15 make && make install 1.16
2.1 --- a/rrdtool/receipt Mon Apr 22 09:48:23 2019 +0100 2.2 +++ b/rrdtool/receipt Mon Apr 22 10:58:42 2019 +0200 2.3 @@ -20,6 +20,7 @@ 2.4 # Rules to configure and make the package. 2.5 compile_rules() 2.6 { 2.7 + export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lz" 2.8 ./configure --prefix=/usr \ 2.9 --infodir=/usr/share/info \ 2.10 --enable-perl-site-install \
3.1 --- a/syslinux/stuff/iso2exe/init Mon Apr 22 09:48:23 2019 +0100 3.2 +++ b/syslinux/stuff/iso2exe/init Mon Apr 22 10:58:42 2019 +0200 3.3 @@ -1040,7 +1040,8 @@ 3.4 fi 3.5 ln -s /sqfs/lib/* lib 3.6 ln -s /sqfs/usr /sqfs/var / 3.7 - /sqfs/bin/busybox --list | while read i; do 3.8 + for i in dmesg basename tr od reboot poweroff getty sync which md5sum \ 3.9 + $(/sqfs/bin/busybox --list 2> /dev/null); do 3.10 [ -x /bin/$i ] || ln -s /sqfs/bin/busybox /bin/$i 3.11 done 3.12 } 3.13 @@ -1050,7 +1051,7 @@ 3.14 is_loram || return 3.15 rm /var /usr 3.16 umount -d /sqfs 3.17 - rmdir /sqfs 3.18 + rmdir /sqfs 2> /dev/null || rm -f /sqfs 3.19 } 3.20 3.21 dosync()