From 0564c415bcc535c46f55effcc91afb44abbce3e4 Mon Sep 17 00:00:00 2001 From: Brad Ackerman Date: Sat, 3 Apr 2021 21:35:56 -0700 Subject: [PATCH 1/2] common/shlibs: fpc --- common/shlibs | 1 + 1 file changed, 1 insertion(+) diff --git a/common/shlibs b/common/shlibs index c33da050a02c..86fc7523f472 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3974,3 +3974,4 @@ libmd.so.0 libmd-1.0.3_1 libldacBT_abr.so.2 ldacBT-2.0.2.3_1 libldacBT_enc.so.2 ldacBT-2.0.2.3_1 libgumbo.so.1 gumbo-parser-0.10.1_2 +libpas2jlib.so fpc-3.2.0_1 From cfebc9aa4f34b48bec748dd03fc463e3d4a8d2db Mon Sep 17 00:00:00 2001 From: Brad Ackerman Date: Sat, 3 Apr 2021 21:37:47 -0700 Subject: [PATCH 2/2] fpc: add ppc64le support --- srcpkgs/fpc/template | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template index 7cf3e9adffe6..72e447ddeed8 100644 --- a/srcpkgs/fpc/template +++ b/srcpkgs/fpc/template @@ -2,12 +2,12 @@ pkgname=fpc version=3.2.0 revision=1 -archs="x86_64* i686*" +archs="x86_64* i686* ppc64le" create_wrksrc=yes build_wrksrc="${pkgname}build-${version}" conf_files="/etc/fpc.cfg /etc/fppkg.cfg" hostmakedepends="rpmextract" -makedepends="ncurses-devel zlib-devel expat-devel" +makedepends="ncurses-devel zlib-devel expat-devel bsdtar" short_desc="Free Pascal Compiler" maintainer="Leah Neukirchen " license="GPL-2.0-or-later, LGPL-2.1-or-later" @@ -23,6 +23,9 @@ i686*) distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.i686.rpm" checksum+=" 05c5600c9461362a08df100cf50ca125cb2b4d5bfe4da48cf8c144f2bf4617a2" ;; +ppc64le*) + distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64le-linux.tar" + checksum+=" 9bf59ae3d336f0de4624c63e4e892ea95de4be2ca66182d185defc50b69b65f3" esac # TODO: figure out cross-build and how to unwrap the ARM .tar. nocross=yes @@ -30,9 +33,25 @@ nopie=yes noverifyrdeps=yes post_extract() { - # relative links needed - ln -sf ../lib64/fpc/${version}/ppcx64 usr/bin - ln -sf ../lib/fpc/${version}/ppc386 usr/bin + # extract recursive tar files or otherwise post-process. + case "$XBPS_TARGET_MACHINE" in + ppc64le*) + mkdir ${wrksrc}/usr + cd ${wrksrc}/${pkgname}-${version}.powerpc64-linux + for f in $(bsdtar -tf binary.powerpc64-linux.tar) + do + bsdtar -xOf binary.powerpc64-linux.tar $f | bsdtar -C ${wrksrc}/usr -xzf - + done + cd ${wrksrc} + ln -sf ../lib/fpc/${version}/ppcppc64 usr/bin + ;; + x86_64* | i686*) + # relative links needed + ln -sf ../lib64/fpc/${version}/ppcx64 usr/bin + ln -sf ../lib/fpc/${version}/ppc386 usr/bin + ;; + esac + # tweak PT_INTERP for musl targets case "$XBPS_TARGET_MACHINE" in