From c708201806b57b11d36dbd6d00d3e512bcabf5da Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 7 Jul 2020 11:03:34 +0200 Subject: community/fpc: _pkgver needs to be set *after* installing the dependencies - else, ppc386 cannot be found --- community/fpc/PKGBUILD | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'community/fpc') diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index b5f8756c..71bd6540 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -5,16 +5,10 @@ # a ppc386 symlink in build (PP variable) because the Makefile is trying to # guess the target platform by executing fpc -_pkgver=$( - find /usr/lib/fpc -name ppc386 \ - | cut -d/ -f5 \ - | sort -V \ - | tail -n1 -) - eval "$( declare -f package | \ sed ' + 2 a _pkgver=$(find /usr/lib/fpc -name ppc386 | cut -d/ -f5 | sort -V | tail -n1) /"\$CARCH" = "x86_64"/ { p s@ppcx64@ppc386@g @@ -24,10 +18,11 @@ eval "$( p s@i486@pentium4@ } - s@NOGDB=1@NOGDB=1 PP=/usr/lib/fpc/'"$_pkgver"'/ppc386 @ + s@NOGDB=1@NOGDB=1 PP=/usr/lib/fpc/$_pkgver/ppc386 @ ' declare -f build | \ sed ' - s@NOGDB=1@NOGDB=1 PP=/usr/lib/fpc/'"$_pkgver"'/ppc386 @ + 2 a _pkgver=$(find /usr/lib/fpc -name ppc386 | cut -d/ -f5 | sort -V | tail -n1) + s@NOGDB=1@NOGDB=1 PP=/usr/lib/fpc/$_pkgver/ppc386 @ ' )" -- cgit v1.2.3