From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wtplan: fix cross, enable pie
Date: Wed, 09 Sep 2020 13:47:51 +0200 [thread overview]
Message-ID: <20200909114751.6DdMkJT1IZvMgF3r_TiGiZNg-R_RBnN5mrtfcd6nGNY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24772@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fix-cross-wtplan
https://github.com/void-linux/void-packages/pull/24772
wtplan: fix cross, enable pie
Tested with x86_64-musl and aarch64-musl.
@Vaelatern
A patch file from https://github.com/void-linux/void-packages/pull/24772.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-cross-wtplan-24772.patch --]
[-- Type: text/x-diff, Size: 1571 bytes --]
From 588293b125089855eb11eb10b0e3b7dc4fdb8c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 9 Sep 2020 08:00:02 +0700
Subject: [PATCH] wtplan: fix cross, enable pie
---
srcpkgs/wtplan/template | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 904ab772db7..5a5b3a54740 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -1,12 +1,10 @@
# Template file for 'wtplan'
pkgname=wtplan
version=0.1
-revision=1
-nocross="runtime/cgo: armv7l-linux-musleabihf-gcc: error: unrecognized command line option '-m64"
+revision=2
+archs="aarch64* armv[567]* i686* x86_64* ppc64le*"
build_style=gnu-makefile
hostmakedepends="go"
-nopie="golang"
-nostrip="golang"
short_desc="Calendar program with terminal and web interfaces and git integration"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
@@ -14,6 +12,18 @@ homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+do_build() {
+ export GOPATH=$(pwd)
+ export VERSIONSTR=$version
+ go generate wtplan
+ go generate wtplan-web
+ . $XBPS_COMMONDIR/environment/build-style/go.sh
+ GOPATH=$(pwd)
+ # Without -buildmode=pie, build failure on armv6hf-musl
+ go build -buildmode=pie wtplan
+ go build -buildmode=pie wtplan-web
+}
+
post_install() {
vlicense LICENSE
}
next prev parent reply other threads:[~2020-09-09 11:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 1:10 [PR PATCH] " sgn
2020-09-09 1:55 ` [PR REVIEW] " ericonr
2020-09-09 11:46 ` sgn
2020-09-09 11:47 ` sgn [this message]
2020-09-11 12:29 ` [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=20200909114751.6DdMkJT1IZvMgF3r_TiGiZNg-R_RBnN5mrtfcd6nGNY@z \
--to=sgn@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).