Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] prototype: fix cross-build
@ 2020-12-25  3:18 ndowens
  2020-12-25  3:20 ` [PR PATCH] [Updated] " ndowens
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: ndowens @ 2020-12-25  3:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages prototype
https://github.com/void-linux/void-packages/pull/27415

prototype: fix cross-build


A patch file from https://github.com/void-linux/void-packages/pull/27415.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prototype-27415.patch --]
[-- Type: text/x-diff, Size: 1241 bytes --]

From 76942986834811e5b03cd1f7f28776515d1a2965 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 24 Dec 2020 21:19:17 -0600
Subject: [PATCH] prototype: fix cross-build

---
 srcpkgs/prototype/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/prototype/template b/srcpkgs/prototype/template
index a9f58d57f91..3bcbcfb1ec3 100644
--- a/srcpkgs/prototype/template
+++ b/srcpkgs/prototype/template
@@ -2,19 +2,19 @@
 pkgname=prototype
 version=1.0.0
 revision=1
-makedepends="libpng-devel SDL2_mixer-devel"
+makedepends="libpng-devel SDL2_mixer-devel libglvnd-devel"
 short_desc="RType remake from Dark Castle Software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://github.com/ptitSeb/prototype"
 distfiles="https://github.com/ptitSeb/prototype/archive/v${version}.tar.gz"
 checksum=400f8a5c727c9feaa6b48b65c23c312db41dd238af9526659bf3342346c05af6
-nocross=yes
 
 CXXFLAGS="-Wno-write-strings"
 
 do_build() {
-	make SDL2=1 LINUX=1 CPP=$CXX ${makejobs}
+	vsed -i '/$(PROGRAM)/s;$(LIBS);;' Makefile
+	make SDL2=1 LINUX=1 CPP=$CXX LD=${CXX} LDFLAGS="${LDFLAGS} -lGL -lm" ${makejobs}
 }
 do_install() {
 	vmkdir usr/libexec/prototype

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] prototype: fix cross-build
  2020-12-25  3:18 [PR PATCH] prototype: fix cross-build ndowens
@ 2020-12-25  3:20 ` ndowens
  2020-12-27 10:46 ` sgn
  2020-12-27 10:46 ` [PR PATCH] [Closed]: " sgn
  2 siblings, 0 replies; 4+ messages in thread
From: ndowens @ 2020-12-25  3:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages prototype
https://github.com/void-linux/void-packages/pull/27415

prototype: fix cross-build


A patch file from https://github.com/void-linux/void-packages/pull/27415.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prototype-27415.patch --]
[-- Type: text/x-diff, Size: 988 bytes --]

From 2e4a88c728be159d930ece6f64ba9aa6402b8227 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 24 Dec 2020 21:19:17 -0600
Subject: [PATCH] prototype: fix cross-build

---
 srcpkgs/prototype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prototype/template b/srcpkgs/prototype/template
index a9f58d57f91..ce3346d5331 100644
--- a/srcpkgs/prototype/template
+++ b/srcpkgs/prototype/template
@@ -9,12 +9,12 @@ license="Public Domain"
 homepage="https://github.com/ptitSeb/prototype"
 distfiles="https://github.com/ptitSeb/prototype/archive/v${version}.tar.gz"
 checksum=400f8a5c727c9feaa6b48b65c23c312db41dd238af9526659bf3342346c05af6
-nocross=yes
 
 CXXFLAGS="-Wno-write-strings"
 
 do_build() {
-	make SDL2=1 LINUX=1 CPP=$CXX ${makejobs}
+	vsed -i '/$(PROGRAM)/s;$(LIBS);;' Makefile
+	make SDL2=1 LINUX=1 CPP=$CXX LD=${CXX} LDFLAGS="${LDFLAGS} -lGL -lm" ${makejobs}
 }
 do_install() {
 	vmkdir usr/libexec/prototype

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: prototype: fix cross-build
  2020-12-25  3:18 [PR PATCH] prototype: fix cross-build ndowens
  2020-12-25  3:20 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-27 10:46 ` sgn
  2020-12-27 10:46 ` [PR PATCH] [Closed]: " sgn
  2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2020-12-27 10:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27415#issuecomment-751452134

Comment:
d417756ba2b03aac56393c664fd2310a2272e004


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Closed]: prototype: fix cross-build
  2020-12-25  3:18 [PR PATCH] prototype: fix cross-build ndowens
  2020-12-25  3:20 ` [PR PATCH] [Updated] " ndowens
  2020-12-27 10:46 ` sgn
@ 2020-12-27 10:46 ` sgn
  2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2020-12-27 10:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

There's a closed pull request on the void-packages repository

prototype: fix cross-build
https://github.com/void-linux/void-packages/pull/27415

Description:


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-12-27 10:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-25  3:18 [PR PATCH] prototype: fix cross-build ndowens
2020-12-25  3:20 ` [PR PATCH] [Updated] " ndowens
2020-12-27 10:46 ` sgn
2020-12-27 10:46 ` [PR PATCH] [Closed]: " sgn

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).