Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] scryer-prolog: use system gmp
@ 2020-07-29 19:28 Chocimier
  2020-07-29 19:33 ` ericonr
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Chocimier @ 2020-07-29 19:28 UTC (permalink / raw)
  To: ml


[-- 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

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

* Re: scryer-prolog: use system gmp
  2020-07-29 19:28 [PR PATCH] scryer-prolog: use system gmp Chocimier
@ 2020-07-29 19:33 ` ericonr
  2020-08-03 19:16 ` [PR PATCH] [Updated] " Chocimier
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-07-29 19:33 UTC (permalink / raw)
  To: ml


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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23934#issuecomment-665859814

Comment:
I guess the cross packages need to be added to #23575 afterwards, right?

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

* Re: [PR PATCH] [Updated] scryer-prolog: use system gmp
  2020-07-29 19:28 [PR PATCH] scryer-prolog: use system gmp Chocimier
  2020-07-29 19:33 ` ericonr
@ 2020-08-03 19:16 ` Chocimier
  2020-08-03 19:16 ` Chocimier
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-08-03 19:16 UTC (permalink / raw)
  To: ml


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

There is an updated 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: 1755 bytes --]

From a6d9f7cefbb5d16633093d60307edf0d4bb7fe8d 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 217ae275fd1..e347de6f519 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"
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

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

* Re: [PR PATCH] [Updated] scryer-prolog: use system gmp
  2020-07-29 19:28 [PR PATCH] scryer-prolog: use system gmp Chocimier
  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
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-08-03 19:16 UTC (permalink / raw)
  To: ml


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

There is an updated 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: 1755 bytes --]

From 6d279612a0b47de2ab8cabd9ec18eb3d4a4ee19c 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 217ae275fd1..be1aca17e5d 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=3
 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
+nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.2.2/build.rs#L1278"
+export CARGO_FEATURE_USE_SYSTEM_LIBS=1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

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

* Re: [PR PATCH] [Updated] scryer-prolog: use system gmp
  2020-07-29 19:28 [PR PATCH] scryer-prolog: use system gmp Chocimier
                   ` (2 preceding siblings ...)
  2020-08-03 19:16 ` Chocimier
@ 2020-08-03 19:18 ` Chocimier
  2020-08-03 19:35 ` [PR PATCH] [Merged]: " Chocimier
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-08-03 19:18 UTC (permalink / raw)
  To: ml


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

There is an updated 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: 1755 bytes --]

From 22a4ade68e62ade102a1e7287d75b04852a10609 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 217ae275fd1..3868993d0dd 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
+nocross="executes gmp header https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/v1.2.2/build.rs#L1278"
+export CARGO_FEATURE_USE_SYSTEM_LIBS=1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

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

* Re: [PR PATCH] [Merged]: scryer-prolog: use system gmp
  2020-07-29 19:28 [PR PATCH] scryer-prolog: use system gmp Chocimier
                   ` (3 preceding siblings ...)
  2020-08-03 19:18 ` Chocimier
@ 2020-08-03 19:35 ` Chocimier
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-08-03 19:35 UTC (permalink / raw)
  To: ml


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

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

scryer-prolog: use system gmp
https://github.com/void-linux/void-packages/pull/23934

Description:
Previous cross-build packages are probably broken anyway.

cc @Johnnynator @mkohlhaas 

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

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29 19:28 [PR PATCH] scryer-prolog: use system gmp Chocimier
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

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git