wok-6.x rev 21871

sarg: fix build
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Sep 25 18:02:05 2019 +0200 (2019-09-25)
parents 7a22ba39ec41
children def8459358ed
files busybox/stuff/command_not_found gcc83-lib-base/receipt re2c/receipt sarg/receipt
line diff
     1.1 --- a/busybox/stuff/command_not_found	Wed Sep 25 11:06:27 2019 +0200
     1.2 +++ b/busybox/stuff/command_not_found	Wed Sep 25 18:02:05 2019 +0200
     1.3 @@ -6,15 +6,14 @@
     1.4  gzip -9 >$LIST && chmod 666 $LIST
     1.5  
     1.6  lookup() {
     1.7 -	zcat $LIST | grep "/$2$1$" | while read pkg file; do
     1.8 +	zcat $LIST | grep "/$2$1$" | if read pkg file; then
     1.9  		cat <<EOT
    1.10  Command '$1' not found, but can be installed as root with:
    1.11  
    1.12  tazpkg -gi ${pkg%:}
    1.13  ${2:+$2$1}
    1.14  EOT
    1.15 -		break
    1.16 -	done
    1.17 +	fi
    1.18  }
    1.19  
    1.20  MSG="$(lookup "$1")"
     2.1 --- a/gcc83-lib-base/receipt	Wed Sep 25 11:06:27 2019 +0200
     2.2 +++ b/gcc83-lib-base/receipt	Wed Sep 25 18:02:05 2019 +0200
     2.3 @@ -30,8 +30,10 @@
     2.4  post_remove()
     2.5  {
     2.6  	cd "$1/usr/lib"
     2.7 -	ln -s libstdc++.so.8.*.* libstdc++.so.8
     2.8 -	ln -s libstdc++.so.8.*.* libstdc++.so
     2.9 +	if [ "$(ls libstdc++.so.8.*.*)" ]; then
    2.10 +		ln -s libstdc++.so.8.*.* libstdc++.so.8
    2.11 +		ln -s libstdc++.so.8.*.* libstdc++.so
    2.12 +	fi
    2.13  	[ -s libgcc_s.so.1.prev ] && mv libgcc_s.so.1.prev libgcc_s.so.1
    2.14  	cd - >/dev/null
    2.15  
     3.1 --- a/re2c/receipt	Wed Sep 25 11:06:27 2019 +0200
     3.2 +++ b/re2c/receipt	Wed Sep 25 18:02:05 2019 +0200
     3.3 @@ -17,6 +17,7 @@
     3.4  # Rules to configure and make the package.
     3.5  compile_rules()
     3.6  {
     3.7 +	[ -d m4 ] || mkdir m4
     3.8  	./autogen.sh
     3.9  	./configure \
    3.10  		--prefix=/usr \
     4.1 --- a/sarg/receipt	Wed Sep 25 11:06:27 2019 +0200
     4.2 +++ b/sarg/receipt	Wed Sep 25 18:02:05 2019 +0200
     4.3 @@ -14,6 +14,7 @@
     4.4  # Rules to configure and make the package.
     4.5  compile_rules()
     4.6  {
     4.7 +	sed -i 's/@mkdir_p@/mkdir -p/' po/Makefile*
     4.8  	./configure						\
     4.9  		--sysconfdir=/etc/sarg				\
    4.10  		--bindir=/usr/bin				\