From: backerman <backerman@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] fpc: Add ppc64le support.
Date: Sun, 04 Apr 2021 06:49:40 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29986@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1825 bytes --]
There is a new pull request by backerman against master on the void-packages repository
https://github.com/backerman/void-packages fpc-ppc
https://github.com/void-linux/void-packages/pull/29986
fpc: Add ppc64le support.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [X] I built this PR locally for my native architecture, (ppc64le-libc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
Details: Ran test suite. There are a small number of failures (36 of 7k+). The tests that fail are the same ones that the bootstrap compiler fails, so I'm fairly sure that no additional failures are introduced by this packaging template.
A patch file from https://github.com/void-linux/void-packages/pull/29986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fpc-ppc-29986.patch --]
[-- Type: text/x-diff, Size: 2806 bytes --]
From 0564c415bcc535c46f55effcc91afb44abbce3e4 Mon Sep 17 00:00:00 2001
From: Brad Ackerman <brad@facefault.org>
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 <brad@facefault.org>
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 <leah@vuxu.org>"
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
next reply other threads:[~2021-04-04 4:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-04 4:49 backerman [this message]
2021-04-04 23:00 ` [PR REVIEW] " ericonr
2021-04-04 23:00 ` ericonr
2021-04-04 23:00 ` ericonr
2021-04-04 23:10 ` q66
2021-04-04 23:17 ` q66
2021-04-04 23:47 ` q66
2021-04-05 0:15 ` [PR PATCH] [Closed]: " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29986@inbox.vuxu.org \
--to=backerman@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).