From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] hedgewars: fix ppc build
Date: Wed, 25 Dec 2019 17:45:55 +0100 [thread overview]
Message-ID: <20191225164555.M6RAp60anTLDZL4R6SS1JXFj4BFh3UWuxBVp1Rr39E8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17759@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by nashimus against master on the void-packages repository
https://github.com/nashimus/void-packages hedgewars
https://github.com/void-linux/void-packages/pull/17759
hedgewars: fix ppc build
A patch file from https://github.com/void-linux/void-packages/pull/17759.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hedgewars-17759.patch --]
[-- Type: text/x-diff, Size: 3229 bytes --]
From 2ec8ad47bb4568e6b61d8c466e905741ca0e9ab4 Mon Sep 17 00:00:00 2001
From: Dylan Nash <nashimus@dismail.de>
Date: Tue, 24 Dec 2019 11:20:15 -0700
Subject: [PATCH 1/2] hedgewars: fix ppc build
---
srcpkgs/hedgewars/template | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 80d7258552b..278689f6729 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -30,12 +30,19 @@ case $XBPS_TARGET_MACHINE in
hostmakedepends+=" glew-devel ghc libatomic-devel"
nopie_files+=" /usr/bin/hedgewars"
;;
+ # forces usage of C engine and ghc due to PPC lacking freepascal compiler
+ ppc*)
+ hostmakedepends="${hostmakedepends// fpc/}"
+ hostmakedepends+=" libatomic-devel ghc"
+ configure_args+=" -DBUILD_ENGINE_C=1"
+ nopie_files+=" /usr/bin/hedgewars"
+ ;;
esac
pre_configure() {
# remove option not supported by clang
case $XBPS_TARGET_MACHINE in
- i686*)
+ i686*|ppc*)
CFLAGS=${CFLAGS/-fstack-clash-protection/}
CXXFLAGS=${CXXFLAGS/-fstack-clash-protection/}
;;
From 0ef5b099eb99e88bc318e7131a8b025ecb027285 Mon Sep 17 00:00:00 2001
From: Dylan Nash <nashimus@dismail.de>
Date: Wed, 25 Dec 2019 09:48:35 -0700
Subject: [PATCH 2/2] hedgewars: add for non x86_64
---
srcpkgs/hedgewars/template | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 278689f6729..8e1b7bb6a44 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
-DPHYSFS_SYSTEM=1 -DCMAKE_VERBOSE_MAKEFILE=1 -DMINIMAL_FLAGS=1"
-hostmakedepends="lua51 pkg-config fpc"
+hostmakedepends="lua51 pkg-config"
makedepends="ffmpeg-devel lua51-devel physfs-devel qt5-tools-devel SDL2_image-devel
SDL2_mixer-devel SDL2_net-devel SDL2_ttf-devel"
depends="hedgewars-data>=${version}_${revision} libfreeglut"
@@ -24,29 +24,26 @@ if [ -n "$CROSS_BUILD" ]; then
fi
case $XBPS_TARGET_MACHINE in
- # forces usage of C engine and ghc due to a 32 bit freepascal bug
- # https://travis-ci.org/void-linux/void-packages/jobs/596458977#L4316
- i686*)
- hostmakedepends+=" glew-devel ghc libatomic-devel"
- nopie_files+=" /usr/bin/hedgewars"
- ;;
- # forces usage of C engine and ghc due to PPC lacking freepascal compiler
- ppc*)
- hostmakedepends="${hostmakedepends// fpc/}"
- hostmakedepends+=" libatomic-devel ghc"
- configure_args+=" -DBUILD_ENGINE_C=1"
- nopie_files+=" /usr/bin/hedgewars"
+ x86_64*)
+ hostmakedepends+=" fpc"
+ ;;
+ *)
+ _use_c_engine=1 # https://www.hedgewars.org/kb/pas2CTutorial
;;
esac
+if [ -n "$_use_c_engine" ]; then
+ hostmakedepends+=" glew-devel libatomic-devel ghc"
+ configure_args+=" -DBUILD_ENGINE_C=1"
+ nopie_files+=" /usr/bin/hedgewars"
+fi
+
pre_configure() {
# remove option not supported by clang
- case $XBPS_TARGET_MACHINE in
- i686*|ppc*)
+ if [ -n "$_use_c_engine" ]; then
CFLAGS=${CFLAGS/-fstack-clash-protection/}
CXXFLAGS=${CXXFLAGS/-fstack-clash-protection/}
- ;;
- esac
+ fi
}
post_install() {
next prev parent reply other threads:[~2019-12-25 16:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-24 18:19 [PR PATCH] " voidlinux-github
2019-12-24 18:32 ` voidlinux-github
2019-12-24 18:35 ` voidlinux-github
2019-12-24 18:36 ` voidlinux-github
2019-12-25 13:28 ` voidlinux-github
2019-12-25 16:45 ` voidlinux-github [this message]
2019-12-25 23:14 ` voidlinux-github
2019-12-26 1:46 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-26 11:22 ` voidlinux-github
2019-12-26 11:23 ` [PR PATCH] [Merged]: " voidlinux-github
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=20191225164555.M6RAp60anTLDZL4R6SS1JXFj4BFh3UWuxBVp1Rr39E8@z \
--to=voidlinux-github@inbox.vuxu.org \
--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).