From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] rott: add execinfo for musl, remove patch.
Date: Tue, 11 Aug 2020 06:47:35 +0200 [thread overview]
Message-ID: <20200811044735.dZbla0xkALHsVCuXBEyIJ37UnoZ1MYw-N5t43tegAIE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24216@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages rott
https://github.com/void-linux/void-packages/pull/24216
rott: add execinfo for musl, remove patch.
A patch file from https://github.com/void-linux/void-packages/pull/24216.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rott-24216.patch --]
[-- Type: text/x-diff, Size: 2398 bytes --]
From 243ba4dd9eef8fd25790d238c524f1a1b2f7449b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 10 Aug 2020 16:58:21 -0300
Subject: [PATCH] rott: add execinfo for musl, remove patch.
---
srcpkgs/rott/patches/no_execinfo.patch | 11 -----------
srcpkgs/rott/template | 24 ++++++++++--------------
2 files changed, 10 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/rott/patches/no_execinfo.patch
diff --git a/srcpkgs/rott/patches/no_execinfo.patch b/srcpkgs/rott/patches/no_execinfo.patch
deleted file mode 100644
index 3391de78ef1..00000000000
--- a/srcpkgs/rott/patches/no_execinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rott/dosutil.c.orig 2016-07-06 16:39:54.045772922 -0400
-+++ rott/dosutil.c 2016-07-06 16:40:27.862760218 -0400
-@@ -197,7 +197,7 @@
- printf ("\033[m");
- }
-
--#if !defined(__CYGWIN__) && !defined(__MINGW32__)
-+#if defined(__GLIBC__)
- #include <execinfo.h>
-
- void print_stack (int level)
diff --git a/srcpkgs/rott/template b/srcpkgs/rott/template
index 428807ab076..8ed9236e672 100644
--- a/srcpkgs/rott/template
+++ b/srcpkgs/rott/template
@@ -1,20 +1,22 @@
# Template file for 'rott'
pkgname=rott
version=1.1.2
-revision=1
-build_style=gnu-makefile
+revision=2
build_wrksrc=rott
-makedepends="SDL_mixer-devel"
-short_desc="A port of Apogee's 3D action title Rise of the Triad"
+build_style=gnu-makefile
+make_use_env=yes
+makedepends="SDL_mixer-devel SDL-devel"
+short_desc="Port of Apogee's 3D action title Rise of the Triad"
maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://icculus.org/rott/"
distfiles="${homepage}/releases/rott-${version}.tar.gz"
checksum=102516e8c312f6b0bbf6c623e1f01cbfbbc314ace8adfe1f201d47b15bd927ff
-do_build() {
- make
-}
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" libexecinfo-devel"
+ export LDLIBS="-lexecinfo"
+fi
do_install() {
vbin "${FILESDIR}/rott"
@@ -23,9 +25,3 @@ do_install() {
vinstall ../misc/rott.desktop 644 usr/share/applications
vinstall ../misc/rott.xpm 644 usr/share/pixmaps/rott.xpm
}
-
-# REMARKS:
-# There is a single patch in place because a feature is optionally disabled for
-# mingw but we need it disabled for musl, since it's not in muslc.
-# The makefile is currently very nice and uses our CFLAGS and LDFLAGS without
-# any patching.
next prev parent reply other threads:[~2020-08-11 4:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 4:20 [PR PATCH] " ericonr
2020-08-11 4:46 ` [PR PATCH] [Updated] " ericonr
2020-08-11 4:47 ` ericonr [this message]
2020-08-11 12:17 ` sgn
2020-08-11 13:02 ` ericonr
2020-08-11 13:02 ` ericonr
2020-08-11 13:50 ` sgn
2020-08-11 13:51 ` [PR PATCH] [Merged]: " sgn
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=20200811044735.dZbla0xkALHsVCuXBEyIJ37UnoZ1MYw-N5t43tegAIE@z \
--to=ericonr@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).