wok-6.x diff perl/receipt @ rev 21704

updated proj and proj-dev (4.7.0 -> 6.1.0)
author Hans-G?nter Theisgen
date Thu Jun 06 17:27:47 2019 +0100 (2019-06-06)
parents 4a7edf0778b6
children 93cfbe138cae
line diff
     1.1 --- a/perl/receipt	Wed Oct 17 21:15:47 2018 +0200
     1.2 +++ b/perl/receipt	Thu Jun 06 17:27:47 2019 +0100
     1.3 @@ -17,9 +17,15 @@
     1.4  cook_tmp_toolchain()
     1.5  {
     1.6  	cd $src
     1.7 -	grep -rl 'uname -m' . | xargs sed -i 's|uname -m|echo i686|'
     1.8  	{ sh Configure -des -Dprefix=/tools \
     1.9 -		-Dstatic_ext='Data/Dumper Fcntl IO' &&
    1.10 +		-Darchname="$ARCH-linux" \
    1.11 +		-Dmyarchname="$ARCH-linux" \
    1.12 +		-Dsitearch="/usr/lib/perl5/site_perl/$VERSION/$ARCH-linux" \
    1.13 +		-Dsitearchexp="/usr/lib/perl5/site_perl/$VERSION/$ARCH-linux" \
    1.14 +		-Darchlib="/usr/lib/perl5/$VERSION/$ARCH-linux" \
    1.15 +		-Darchlibexp="/usr/lib/perl5/$VERSION/$ARCH-linux" \
    1.16 +		-Dinstallarchlib="/usr/lib/perl5/$VERSION/$ARCH-linux" \
    1.17 +		-Dstatic_ext='Data/Dumper Fcntl IO'
    1.18  	
    1.19  	# Only few tools are needed in the tmp toolchain.
    1.20  	make perl utilities ext/Errno/pm_to_blib
    1.21 @@ -34,8 +40,14 @@
    1.22  #
    1.23  compile_rules()
    1.24  {
    1.25 -	grep -rl 'uname -m' . | xargs sed -i 's|uname -m|echo i686|'
    1.26 -	./configure.gnu --prefix=/usr &&
    1.27 +	./configure.gnu --prefix=/usr \
    1.28 +		-Darchname="$ARCH-linux" \
    1.29 +		-Dmyarchname="$ARCH-linux" \
    1.30 +		-Dsitearch="/usr/lib/perl5/site_perl/$VERSION/$ARCH-linux" \
    1.31 +		-Dsitearchexp="/usr/lib/perl5/site_perl/$VERSION/$ARCH-linux" \
    1.32 +		-Darchlib="/usr/lib/perl5/$VERSION/$ARCH-linux" \
    1.33 +		-Darchlibexp="/usr/lib/perl5/$VERSION/$ARCH-linux" \
    1.34 +		-Dinstallarchlib="/usr/lib/perl5/$VERSION/$ARCH-linux" &&
    1.35  	make &&
    1.36  	make install
    1.37