* [PR PATCH] srb2: fix build with latest xbps-src
@ 2022-09-03 17:42 oreo639
2022-09-05 16:34 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2022-09-03 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages srb2
https://github.com/void-linux/void-packages/pull/39089
srb2: fix build with latest xbps-src
This fixes a build failure introduced by:
https://github.com/void-linux/void-packages/commit/e14cf6cc7a85fcde7fb3fdb2cdba117bede8bb19
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39089.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-srb2-39089.patch --]
[-- Type: text/x-diff, Size: 1340 bytes --]
From 24c547e5f1bd45e8c6bf1809606f75f7e64a2d83 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 3 Sep 2022 10:40:41 -0700
Subject: [PATCH] srb2: fix build with latest xbps-src
This fixes a build failure introduced by:
https://github.com/void-linux/void-packages/commit/e14cf6cc7a85fcde7fb3fdb2cdba117bede8bb19
---
srcpkgs/srb2/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template
index f966b5e88a6c..1fb45fd1875e 100644
--- a/srcpkgs/srb2/template
+++ b/srcpkgs/srb2/template
@@ -6,10 +6,11 @@ create_wrksrc=true
build_wrksrc="SRB2-SRB2_release_${version}"
build_style=gnu-makefile
make_use_env=yes
-make_build_args=" -C src ECHO=1 LINUX=1 USE_OPENMP=1 EXENAME=${pkgname}
- DBGNAME=${pkgname}-debug NOOBJDUMP=1 NOUPX=1"
+make_build_args="ECHO=1 LINUX=1 USE_OPENMP=1 EXENAME=${pkgname}
+ DBGNAME=${pkgname}-debug NOOBJDUMP=1 NOUPX=1 PREFIX="
hostmakedepends="pkg-config gettext"
-makedepends="SDL2-devel SDL2_mixer-devel libpng-devel libupnp-devel libcurl-devel libgme-devel libopenmpt-devel"
+makedepends="SDL2-devel SDL2_mixer-devel libpng-devel libupnp-devel
+ libcurl-devel libgme-devel libopenmpt-devel"
short_desc="3D Sonic fan game based off of Doom Legacy"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: srb2: fix build with latest xbps-src
2022-09-03 17:42 [PR PATCH] srb2: fix build with latest xbps-src oreo639
@ 2022-09-05 16:34 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2022-09-05 16:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1352 bytes --]
There's a merged pull request on the void-packages repository
srb2: fix build with latest xbps-src
https://github.com/void-linux/void-packages/pull/39089
Description:
This fixes a build failure introduced by:
https://github.com/void-linux/void-packages/commit/e14cf6cc7a85fcde7fb3fdb2cdba117bede8bb19
The previously failing line of code:
https://git.do.srb2.org/STJr/SRB2/-/blob/next/src/Makefile.d/util.mk#L72-73
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-05 16:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-03 17:42 [PR PATCH] srb2: fix build with latest xbps-src oreo639
2022-09-05 16:34 ` [PR PATCH] [Merged]: " classabbyamp
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).