From: Skirmisher <Skirmisher@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] OpenRCT2: fix build type
Date: Wed, 14 Apr 2021 02:48:16 +0200 [thread overview]
Message-ID: <20210414004816.v10bj5X9RWeLZ2NcSPdITRxNj3qrJ8oZd6mjGekjRas@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30201@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 672 bytes --]
There is an updated pull request by Skirmisher against master on the void-packages repository
https://github.com/Skirmisher/void-packages upstream-master
https://github.com/void-linux/void-packages/pull/30201
OpenRCT2: fix build type
By default it produces a debug build, which crashes on assertions insetad of discarding them.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/30201.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-upstream-master-30201.patch --]
[-- Type: text/x-diff, Size: 1258 bytes --]
From 53a3931ee178fe1dad1bb8aa2ebd723c54d21d04 Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Tue, 13 Apr 2021 01:17:10 -0700
Subject: [PATCH] OpenRCT2: fix build type
By default it produces a debug build, which crashes on assertions instead of
discarding them.
---
srcpkgs/OpenRCT2/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c5256b65287e..9705491f8f27 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
_objects_version=1.0.21
_titles_version=0.1.2c
version=0.3.3
-revision=1
+revision=2
build_style=cmake
configure_args="
-DOPENRCT2_VERSION_TAG=${version}
@@ -37,6 +37,8 @@ skip_extraction="objects.zip title-sequences.zip"
replaces="OpenRCT2-data>=0"
+CXXFLAGS="-DNDEBUG"
+
build_options="multiplayer scripting"
build_options_default="multiplayer scripting"
desc_option_multiplayer="Enable multiplayer support"
@@ -48,7 +50,7 @@ fi
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" OpenRCT2"
- CXXFLAGS="-DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
+ CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1 "
fi
pre_configure() {
next prev parent reply other threads:[~2021-04-14 0:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 8:41 [PR PATCH] " Skirmisher
2021-04-13 14:40 ` [PR REVIEW] " sgn
2021-04-13 17:25 ` Skirmisher
2021-04-14 0:01 ` sgn
2021-04-14 0:28 ` [PR PATCH] [Updated] " Skirmisher
2021-04-14 0:32 ` Skirmisher
2021-04-14 0:34 ` [PR REVIEW] " Skirmisher
2021-04-14 0:46 ` [PR PATCH] [Updated] " Skirmisher
2021-04-14 0:48 ` Skirmisher [this message]
2021-04-14 0:53 ` [PR REVIEW] " Skirmisher
2021-04-24 20:18 ` [PR PATCH] [Updated] " Skirmisher
2021-04-24 20:18 ` [PR PATCH] [Merged]: " 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=20210414004816.v10bj5X9RWeLZ2NcSPdITRxNj3qrJ8oZd6mjGekjRas@z \
--to=skirmisher@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).