Github messages for voidlinux
 help / color / mirror / Atom feed
From: Chocimier <Chocimier@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] scryer-prolog: use system gmp
Date: Wed, 29 Jul 2020 21:28:07 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23934@inbox.vuxu.org> (raw)

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

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

https://github.com/Chocimier/void-packages-org scryer-prolog
https://github.com/void-linux/void-packages/pull/23934

scryer-prolog: use system gmp
Previous cross-build packages are probably broken anyway.

cc @Johnnynator @mkohlhaas 

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

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

From 78e86a2d65ac932265f526ad88a5debdd8c065e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 29 Jul 2020 21:23:42 +0200
Subject: [PATCH] scryer-prolog: use system gmp

---
 srcpkgs/scryer-prolog/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d1a4a585ef7..a9ae921054e 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -1,24 +1,18 @@
 # Template file for 'scryer-prolog'
 pkgname=scryer-prolog
 version=0.8.123
-revision=1
-archs="~i686" # aggresive cpu detection
+revision=2
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-depends="gmp"
+makedepends="gmp-devel mpfr-devel libmpc-devel"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	# XXX: Also should have GMP_MPFR_SYS_CACHE="" set somewhere https://crates.io/crates/gmp-mpfr-sys (we have ccache for that)
-	# We might also want to use system libs instead
-	# the runtime dep on gmp is incorrect right now, since gmp is statically linked
-	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/29779/steps/shell_3/logs/stdio"
-fi
+export CARGO_FEATURE_USE_SYSTEM_LIBS=1
+nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.2.2/build.rs#L1278"
 
 post_install() {
 	vlicense LICENSE

             reply	other threads:[~2020-07-29 19:28 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-29 19:28 Chocimier [this message]
2020-07-29 19:33 ` ericonr
2020-08-03 19:16 ` [PR PATCH] [Updated] " Chocimier
2020-08-03 19:16 ` Chocimier
2020-08-03 19:18 ` Chocimier
2020-08-03 19:35 ` [PR PATCH] [Merged]: " Chocimier

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23934@inbox.vuxu.org \
    --to=chocimier@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).