Special method used to generate x86_64-solaris 3.2.0-rc1 distribution Starting with release compiler /home/muller/pas/x86_64/fpc-3.2.0/bin/ppcx64 /home/muller/pas/x86_64/fpc-3.2.0/bin/ppcx64 -iVDWSOSPTOTP: 3.2.0 2020/03/04 3.2.0-beta solaris x86_64 solaris x86_64 /opt/csw/bin/gmake cycle OPT="-n -gl" FPC=/home/muller/pas/x86_64/fpc-3.2.0/bin/ppcx64 cp ./ppcx64 /home/muller/pas/release-build/release_3_2_0_rc1/fpcsrc/compiler/ppcx64-3.2.0-rc1 cp ./ppcx64 ./ppcx64-3.2.0-rc1 Starting ./install/makepack x86_64-solaris Files /home/muller/pas/release-build/release_3_2_0_rc1/readme.x86_64-solaris and fpc-3.2.0rc1.x86_64-solaris.tar uploaded Used slightly modifed svn checkout svn st -q M install/makepack M fpcsrc/utils/fpcm/revision.inc svn diff Index: install/makepack =================================================================== --- install/makepack (revision 1463) +++ install/makepack (working copy) @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/bash # # Shell script to make a FPC .tar package for Linux # Copyright 1996-2004 Michael Van Canneyt and Peter Vreman @@ -22,16 +22,19 @@ VERSION=`grep '^version *=' fpcsrc/Makefile.fpc | sed 's+[^=]*= *\([0-9\.]*\).*+\1+'` +if [ -z "$FPC" ] ; then + FPC=fpc +fi # Retrieve current system info by calling FPC. We need # to use the | head -n1 to fix a bug in fpc 1.9.4 and earlier # that uses exitcode 1 also when printing info resulting in # fpc binary to print an error line (PFV) -SOURCECPU=`fpc -iSP | head -n1` -SOURCEOS=`fpc -iSO | head -n1` +SOURCECPU=`$FPC -iSP | head -n1` +SOURCEOS=`$FPC -iSO | head -n1` # retrieve real OS. -HOSTOS=`uname -s | tr "[:upper:]" "[:lower:]"` +HOSTOS=`uname -s | tr SO so ` MAKE=make TAR=tar @@ -38,16 +41,16 @@ case "$HOSTOS" in *freebsd*) MAKE=gmake - EXTRAOPT="-Fl/usr/local/lib -Fl/usr/X11R6/lib -dFREEBSD5" + EXTRAOPT+=" -Fl/usr/local/lib -Fl/usr/X11R6/lib -dFREEBSD5" ;; *netbsd*) MAKE=gmake - EXTRAOPT="-Fl/usr/pkg/lib" + EXTRAOPT+=" -Fl/usr/pkg/lib" ;; *sunos*) MAKE=gmake # Use system linker if on solaris machine if [ "$SOURCEOS" == "solaris" ]; then - EXTRAOPT="-Xn" + EXTRAOPT+=" -Xn" fi # Use GNU tar if present if [ "`which gtar`" != "" ]; then @@ -55,7 +58,7 @@ fi ;; *openbsd*) MAKE=gmake - EXTRAOPT="-Fl/usr/local/lib" + EXTRAOPT+=" -Fl/usr/local/lib" ;; esac svn diff fpcsrc Index: fpcsrc/utils/fpcm/revision.inc =================================================================== --- fpcsrc/utils/fpcm/revision.inc (revision 44251) +++ fpcsrc/utils/fpcm/revision.inc (working copy) @@ -1 +1 @@ -'2019-05-28 rev 42133' +'2020-02-23 rev 44237'