* [PR PATCH] guile: update to 3.0.2.
@ 2020-05-26 3:48 anjandev
2020-05-26 3:52 ` ericonr
` (23 more replies)
0 siblings, 24 replies; 25+ messages in thread
From: anjandev @ 2020-05-26 3:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
There is a new pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
guile: update to 3.0.2.
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 4422 bytes --]
From 6a97090963c2e9312d9312c6f4afa075fec6642d Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Mon, 25 May 2020 20:46:38 -0700
Subject: [PATCH] guile: update to 3.0.2.
---
common/shlibs | 2 ++
srcpkgs/guile/patches/musl-longlong.patch | 13 --------
srcpkgs/guile/patches/non-static.patch | 40 -----------------------
srcpkgs/guile/template | 14 ++++----
4 files changed, 9 insertions(+), 60 deletions(-)
delete mode 100644 srcpkgs/guile/patches/musl-longlong.patch
delete mode 100644 srcpkgs/guile/patches/non-static.patch
diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..16be27cefde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile-3.0.2_1
+guile-readline.so.0 libguile-3.0.2_1
diff --git a/srcpkgs/guile/patches/musl-longlong.patch b/srcpkgs/guile/patches/musl-longlong.patch
deleted file mode 100644
index 0e968058a09..00000000000
--- a/srcpkgs/guile/patches/musl-longlong.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libguile/fports.c.orig 2017-02-12 22:06:33.000000000 +0100
-+++ libguile/fports.c 2017-10-26 19:09:26.425213055 +0200
-@@ -66,8 +66,8 @@
- #define OFF_T_MAX LONG_MAX
- #define OFF_T_MIN LONG_MIN
- #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
--#define OFF_T_MAX LONG_LONG_MAX
--#define OFF_T_MIN LONG_LONG_MIN
-+#define OFF_T_MAX LLONG_MAX
-+#define OFF_T_MIN LLONG_MIN
- #else
- #error Oops, unknown OFF_T size
- #endif
diff --git a/srcpkgs/guile/patches/non-static.patch b/srcpkgs/guile/patches/non-static.patch
deleted file mode 100644
index 8896762df89..00000000000
--- a/srcpkgs/guile/patches/non-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libguile/finalizers.c 2014-05-02 15:15:57.000000000 +0200
-+++ libguile/finalizers.c 2019-01-04 14:32:52.336586516 +0100
-@@ -164,7 +164,7 @@
- \f
-
- #ifndef HAVE_GC_SET_FINALIZER_NOTIFIER
--static void
-+void
- GC_set_finalizer_notifier (void (*notifier) (void))
- {
- GC_finalizer_notifier = notifier;
---- libguile/gc.c 2016-12-15 01:03:33.000000000 +0100
-+++ libguile/gc.c 2019-01-04 14:35:56.357579179 +0100
-@@ -196,7 +196,7 @@
- /* Compatibility. */
-
- #ifndef HAVE_GC_GET_HEAP_USAGE_SAFE
--static void
-+void
- GC_get_heap_usage_safe (GC_word *pheap_size, GC_word *pfree_bytes,
- GC_word *punmapped_bytes, GC_word *pbytes_since_gc,
- GC_word *ptotal_bytes)
-@@ -214,7 +214,7 @@
- #endif
-
- #ifndef HAVE_GC_GET_FREE_SPACE_DIVISOR
--static GC_word
-+GC_word
- GC_get_free_space_divisor (void)
- {
- return GC_free_space_divisor;
-@@ -586,7 +586,7 @@
- }
-
- #ifndef HAVE_GC_SET_FINALIZE_ON_DEMAND
--static void
-+void
- GC_set_finalize_on_demand (int foo)
- {
- GC_finalize_on_demand = foo;
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ffea17c3846..3611de15f27 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,18 +1,18 @@
# Template file for 'guile'
pkgname=guile
-version=2.0.14
-revision=9
+version=3.0.2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-error-on-warning"
hostmakedepends="pkg-config texinfo"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi<anjan@momi.ca>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="http://www.gnu.org/software/${pkgname}"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
subpackages="libguile guile-devel"
if [ "$CROSS_BUILD" ]; then
@@ -30,8 +30,8 @@ pre_configure() {
libguile_package() {
short_desc+=" - runtime library"
pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove "usr/lib/libguilereadline*.so"
+ vmove "usr/lib/libguile*.so.*"
+ vmove "usr/lib/guile/3.0/extensions/guile-readline.so.*"
vmkdir usr/share/gdb/auto-load/usr/lib
mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
@ 2020-05-26 3:52 ` ericonr
2020-05-26 3:55 ` [PR PATCH] [Updated] " anjandev
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-05-26 3:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-633793722
Comment:
For reference:
- #16721
- #6524
I think they faced quite a few issues with the update. Looking forward to building Guix, though :D
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
2020-05-26 3:52 ` ericonr
@ 2020-05-26 3:55 ` anjandev
2020-05-26 3:57 ` anjandev
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-26 3:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
guile: update to 3.0.2.
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 4367 bytes --]
From 0d39f4a27fda27eeada2fb6047d73d383b8f3eae Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Mon, 25 May 2020 20:46:38 -0700
Subject: [PATCH] guile: update to 3.0.2.
---
common/shlibs | 2 ++
srcpkgs/guile/patches/musl-longlong.patch | 13 --------
srcpkgs/guile/patches/non-static.patch | 40 -----------------------
srcpkgs/guile/template | 12 +++----
4 files changed, 8 insertions(+), 59 deletions(-)
delete mode 100644 srcpkgs/guile/patches/musl-longlong.patch
delete mode 100644 srcpkgs/guile/patches/non-static.patch
diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..16be27cefde 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile-3.0.2_1
+guile-readline.so.0 libguile-3.0.2_1
diff --git a/srcpkgs/guile/patches/musl-longlong.patch b/srcpkgs/guile/patches/musl-longlong.patch
deleted file mode 100644
index 0e968058a09..00000000000
--- a/srcpkgs/guile/patches/musl-longlong.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libguile/fports.c.orig 2017-02-12 22:06:33.000000000 +0100
-+++ libguile/fports.c 2017-10-26 19:09:26.425213055 +0200
-@@ -66,8 +66,8 @@
- #define OFF_T_MAX LONG_MAX
- #define OFF_T_MIN LONG_MIN
- #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
--#define OFF_T_MAX LONG_LONG_MAX
--#define OFF_T_MIN LONG_LONG_MIN
-+#define OFF_T_MAX LLONG_MAX
-+#define OFF_T_MIN LLONG_MIN
- #else
- #error Oops, unknown OFF_T size
- #endif
diff --git a/srcpkgs/guile/patches/non-static.patch b/srcpkgs/guile/patches/non-static.patch
deleted file mode 100644
index 8896762df89..00000000000
--- a/srcpkgs/guile/patches/non-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libguile/finalizers.c 2014-05-02 15:15:57.000000000 +0200
-+++ libguile/finalizers.c 2019-01-04 14:32:52.336586516 +0100
-@@ -164,7 +164,7 @@
- \f
-
- #ifndef HAVE_GC_SET_FINALIZER_NOTIFIER
--static void
-+void
- GC_set_finalizer_notifier (void (*notifier) (void))
- {
- GC_finalizer_notifier = notifier;
---- libguile/gc.c 2016-12-15 01:03:33.000000000 +0100
-+++ libguile/gc.c 2019-01-04 14:35:56.357579179 +0100
-@@ -196,7 +196,7 @@
- /* Compatibility. */
-
- #ifndef HAVE_GC_GET_HEAP_USAGE_SAFE
--static void
-+void
- GC_get_heap_usage_safe (GC_word *pheap_size, GC_word *pfree_bytes,
- GC_word *punmapped_bytes, GC_word *pbytes_since_gc,
- GC_word *ptotal_bytes)
-@@ -214,7 +214,7 @@
- #endif
-
- #ifndef HAVE_GC_GET_FREE_SPACE_DIVISOR
--static GC_word
-+GC_word
- GC_get_free_space_divisor (void)
- {
- return GC_free_space_divisor;
-@@ -586,7 +586,7 @@
- }
-
- #ifndef HAVE_GC_SET_FINALIZE_ON_DEMAND
--static void
-+void
- GC_set_finalize_on_demand (int foo)
- {
- GC_finalize_on_demand = foo;
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ffea17c3846..787df2cf02c 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,18 +1,18 @@
# Template file for 'guile'
pkgname=guile
-version=2.0.14
-revision=9
+version=3.0.2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-error-on-warning"
hostmakedepends="pkg-config texinfo"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="http://www.gnu.org/software/${pkgname}"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
subpackages="libguile guile-devel"
if [ "$CROSS_BUILD" ]; then
@@ -31,7 +31,7 @@ libguile_package() {
short_desc+=" - runtime library"
pkg_install() {
vmove "usr/lib/*.so.*"
- vmove "usr/lib/libguilereadline*.so"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
vmkdir usr/share/gdb/auto-load/usr/lib
mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
}
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
2020-05-26 3:52 ` ericonr
2020-05-26 3:55 ` [PR PATCH] [Updated] " anjandev
@ 2020-05-26 3:57 ` anjandev
2020-05-26 3:57 ` anjandev
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-26 3:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
New comment by anjandev on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-633794695
Comment:
@ericonr I got it to compile and run on my machine:
```
anjan@navi ~/b/void-packages (guile)> guile
GNU Guile 3.0.2
Copyright (C) 1995-2020 Free Software Foundation, Inc.
Guile comes with ABSOLUTELY NO WARRANTY; for details type `,show w'.
This program is free software, and you are welcome to redistribute it
under certain conditions; type `,show c' for details.
Enter `,help' for help.
scheme@(guile-user)>
```
Maybe the guile guys fixed the issues the others were having?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (2 preceding siblings ...)
2020-05-26 3:57 ` anjandev
@ 2020-05-26 3:57 ` anjandev
2020-05-26 4:01 ` anjandev
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-26 3:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
New comment by anjandev on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-633794695
Comment:
@ericonr I got it to compile and run on my machine:
```
anjan@navi ~/b/void-packages (guile)> guile
GNU Guile 3.0.2
Copyright (C) 1995-2020 Free Software Foundation, Inc.
Guile comes with ABSOLUTELY NO WARRANTY; for details type `,show w'.
This program is free software, and you are welcome to redistribute it
under certain conditions; type `,show c' for details.
Enter `,help' for help.
scheme@(guile-user)>
```
Maybe the guile guys fixed the issues the others were having?
Also, it seems I can use guile in orgmode in emacs =D
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (3 preceding siblings ...)
2020-05-26 3:57 ` anjandev
@ 2020-05-26 4:01 ` anjandev
2020-05-26 6:32 ` fosslinux
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-26 4:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
New comment by anjandev on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-633795444
Comment:
It seems like the projects that depend on guile are hard to get to compile. I will leave this open so others can build upon my work. I just wanted to play around with lisp as it is one of my favorite languages.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (4 preceding siblings ...)
2020-05-26 4:01 ` anjandev
@ 2020-05-26 6:32 ` fosslinux
2020-05-26 7:30 ` travankor
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: fosslinux @ 2020-05-26 6:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-633833499
Comment:
Maybe a guile3.0 package would be better, rather than updating guile, which every package seems to break on.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (5 preceding siblings ...)
2020-05-26 6:32 ` fosslinux
@ 2020-05-26 7:30 ` travankor
2020-05-26 17:49 ` ericonr
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: travankor @ 2020-05-26 7:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
New comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-633858909
Comment:
>I think they faced quite a few issues with the update. Looking forward to building Guix, though :D
@ericonr
Are you interested in packaging and maintaining this? If you could that would be great! Should be similar to nix.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (6 preceding siblings ...)
2020-05-26 7:30 ` travankor
@ 2020-05-26 17:49 ` ericonr
2020-05-26 23:07 ` [PR PATCH] [Updated] " anjandev
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-05-26 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634176820
Comment:
@travankor I am, yes. It would depend on Guix building cleanly, though, because I don't think I'd be able to patch it much myself (the C part perhaps, the Guile stuff definitely not).
@fosslinux I think `guile3` would be better, but otherwise I agree. If guile 3.0 and guile 2.x don't have file conflicts, we can try to update applications to Guile 3.0 as well, if they work without issue.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] guile: update to 3.0.2.
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (7 preceding siblings ...)
2020-05-26 17:49 ` ericonr
@ 2020-05-26 23:07 ` anjandev
2020-05-27 1:32 ` [PR PATCH] [Updated] New package: guile3-3.0.2 anjandev
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-26 23:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
guile: update to 3.0.2.
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 2981 bytes --]
From 3a1a4a464d554c96102f5fada1f2fd323e7efca2 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 16:06:41 -0700
Subject: [PATCH] New package: guile3-3.0.2
---
common/shlibs | 2 ++
srcpkgs/guile3-devel | 1 +
srcpkgs/guile3/template | 50 +++++++++++++++++++++++++++++++++++++++++
srcpkgs/libguile3 | 1 +
4 files changed, 54 insertions(+)
create mode 120000 srcpkgs/guile3-devel
create mode 100644 srcpkgs/guile3/template
create mode 120000 srcpkgs/libguile3
diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..28500f05769 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..6a29f3c7d20
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,50 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+ # Need host guile to cross compile
+ hostmakedepends+=" guile"
+fi
+
+pre_configure() {
+ # magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+ case "$XBPS_TARGET_MACHINE" in
+ ppc*) export CFLAGS+=" -Os";;
+ esac
+}
+
+libguile_package() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+ vmkdir usr/share/gdb/auto-load/usr/lib
+ mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+ }
+}
+
+guile-devel_package() {
+ short_desc+=" - development files"
+ depends="gmp-devel gc-devel guile>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/bin/guile-config
+ vmove usr/include
+ vmove usr/share/aclocal
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (8 preceding siblings ...)
2020-05-26 23:07 ` [PR PATCH] [Updated] " anjandev
@ 2020-05-27 1:32 ` anjandev
2020-05-27 1:37 ` anjandev
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 1:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
New package: guile3-3.0.2
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 6785 bytes --]
From f2eef5e4579f54610515cfe3a667b79360a1da10 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 16:06:41 -0700
Subject: [PATCH] New package: guile3-3.0.2
---
common/shlibs | 2 +
srcpkgs/guile/patches/musl-longlong.patch | 13 ------
srcpkgs/guile/patches/non-static.patch | 40 ------------------
srcpkgs/guile/template | 12 +++---
srcpkgs/guile3-devel | 1 +
srcpkgs/guile3/template | 51 +++++++++++++++++++++++
srcpkgs/libguile3 | 1 +
7 files changed, 61 insertions(+), 59 deletions(-)
delete mode 100644 srcpkgs/guile/patches/musl-longlong.patch
delete mode 100644 srcpkgs/guile/patches/non-static.patch
create mode 120000 srcpkgs/guile3-devel
create mode 100644 srcpkgs/guile3/template
create mode 120000 srcpkgs/libguile3
diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..28500f05769 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile/patches/musl-longlong.patch b/srcpkgs/guile/patches/musl-longlong.patch
deleted file mode 100644
index 0e968058a09..00000000000
--- a/srcpkgs/guile/patches/musl-longlong.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libguile/fports.c.orig 2017-02-12 22:06:33.000000000 +0100
-+++ libguile/fports.c 2017-10-26 19:09:26.425213055 +0200
-@@ -66,8 +66,8 @@
- #define OFF_T_MAX LONG_MAX
- #define OFF_T_MIN LONG_MIN
- #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
--#define OFF_T_MAX LONG_LONG_MAX
--#define OFF_T_MIN LONG_LONG_MIN
-+#define OFF_T_MAX LLONG_MAX
-+#define OFF_T_MIN LLONG_MIN
- #else
- #error Oops, unknown OFF_T size
- #endif
diff --git a/srcpkgs/guile/patches/non-static.patch b/srcpkgs/guile/patches/non-static.patch
deleted file mode 100644
index 8896762df89..00000000000
--- a/srcpkgs/guile/patches/non-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libguile/finalizers.c 2014-05-02 15:15:57.000000000 +0200
-+++ libguile/finalizers.c 2019-01-04 14:32:52.336586516 +0100
-@@ -164,7 +164,7 @@
- \f
-
- #ifndef HAVE_GC_SET_FINALIZER_NOTIFIER
--static void
-+void
- GC_set_finalizer_notifier (void (*notifier) (void))
- {
- GC_finalizer_notifier = notifier;
---- libguile/gc.c 2016-12-15 01:03:33.000000000 +0100
-+++ libguile/gc.c 2019-01-04 14:35:56.357579179 +0100
-@@ -196,7 +196,7 @@
- /* Compatibility. */
-
- #ifndef HAVE_GC_GET_HEAP_USAGE_SAFE
--static void
-+void
- GC_get_heap_usage_safe (GC_word *pheap_size, GC_word *pfree_bytes,
- GC_word *punmapped_bytes, GC_word *pbytes_since_gc,
- GC_word *ptotal_bytes)
-@@ -214,7 +214,7 @@
- #endif
-
- #ifndef HAVE_GC_GET_FREE_SPACE_DIVISOR
--static GC_word
-+GC_word
- GC_get_free_space_divisor (void)
- {
- return GC_free_space_divisor;
-@@ -586,7 +586,7 @@
- }
-
- #ifndef HAVE_GC_SET_FINALIZE_ON_DEMAND
--static void
-+void
- GC_set_finalize_on_demand (int foo)
- {
- GC_finalize_on_demand = foo;
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ffea17c3846..787df2cf02c 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,18 +1,18 @@
# Template file for 'guile'
pkgname=guile
-version=2.0.14
-revision=9
+version=3.0.2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-error-on-warning"
hostmakedepends="pkg-config texinfo"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="http://www.gnu.org/software/${pkgname}"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
subpackages="libguile guile-devel"
if [ "$CROSS_BUILD" ]; then
@@ -31,7 +31,7 @@ libguile_package() {
short_desc+=" - runtime library"
pkg_install() {
vmove "usr/lib/*.so.*"
- vmove "usr/lib/libguilereadline*.so"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
vmkdir usr/share/gdb/auto-load/usr/lib
mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
}
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..6d329d2e2fe
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+build_style=gnu-configure
+wrksrc=guile-${version}
+configure_args="--disable-static --disable-error-on-warning"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+ # Need host guile to cross compile
+ hostmakedepends+=" guile"
+fi
+
+pre_configure() {
+ # magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+ case "$XBPS_TARGET_MACHINE" in
+ ppc*) export CFLAGS+=" -Os";;
+ esac
+}
+
+libguile_package() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+ vmkdir usr/share/gdb/auto-load/usr/lib
+ mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+ }
+}
+
+guile-devel_package() {
+ short_desc+=" - development files"
+ depends="gmp-devel gc-devel guile>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/bin/guile-config
+ vmove usr/include
+ vmove usr/share/aclocal
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (9 preceding siblings ...)
2020-05-27 1:32 ` [PR PATCH] [Updated] New package: guile3-3.0.2 anjandev
@ 2020-05-27 1:37 ` anjandev
2020-05-27 1:42 ` ericonr
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
New comment by anjandev on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634372663
Comment:
Érico Nogueira Rolim <notifications@github.com> writes:
> @travankor I am, yes. It would depend on Guix building cleanly,
> though, because I don't think I'd be able to patch it much myself (the
> C part perhaps, the Guile stuff definitely not).
I will be happy to change you to the maintainer Érico. I have no
experience patching Guile stuff and don't have much use for
this package. I just wanted to play around with Guile.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (10 preceding siblings ...)
2020-05-27 1:37 ` anjandev
@ 2020-05-27 1:42 ` ericonr
2020-05-27 1:43 ` [PR PATCH] [Updated] " anjandev
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-05-27 1:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634375332
Comment:
Yeah, I don't have that experience either :p
We need to check if anything can be updated and if this package has file conflicts with guile2.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (11 preceding siblings ...)
2020-05-27 1:42 ` ericonr
@ 2020-05-27 1:43 ` anjandev
2020-05-27 2:05 ` anjandev
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 1:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
New package: guile3-3.0.2
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 6787 bytes --]
From 173f97127844ff6fc842a9b80873e972f6846be7 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 16:06:41 -0700
Subject: [PATCH] New package: guile3-3.0.2
---
common/shlibs | 2 +
srcpkgs/guile/patches/musl-longlong.patch | 13 ------
srcpkgs/guile/patches/non-static.patch | 40 ------------------
srcpkgs/guile/template | 12 +++---
srcpkgs/guile3-devel | 1 +
srcpkgs/guile3/template | 51 +++++++++++++++++++++++
srcpkgs/libguile3 | 1 +
7 files changed, 61 insertions(+), 59 deletions(-)
delete mode 100644 srcpkgs/guile/patches/musl-longlong.patch
delete mode 100644 srcpkgs/guile/patches/non-static.patch
create mode 120000 srcpkgs/guile3-devel
create mode 100644 srcpkgs/guile3/template
create mode 120000 srcpkgs/libguile3
diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..28500f05769 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile/patches/musl-longlong.patch b/srcpkgs/guile/patches/musl-longlong.patch
deleted file mode 100644
index 0e968058a09..00000000000
--- a/srcpkgs/guile/patches/musl-longlong.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libguile/fports.c.orig 2017-02-12 22:06:33.000000000 +0100
-+++ libguile/fports.c 2017-10-26 19:09:26.425213055 +0200
-@@ -66,8 +66,8 @@
- #define OFF_T_MAX LONG_MAX
- #define OFF_T_MIN LONG_MIN
- #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
--#define OFF_T_MAX LONG_LONG_MAX
--#define OFF_T_MIN LONG_LONG_MIN
-+#define OFF_T_MAX LLONG_MAX
-+#define OFF_T_MIN LLONG_MIN
- #else
- #error Oops, unknown OFF_T size
- #endif
diff --git a/srcpkgs/guile/patches/non-static.patch b/srcpkgs/guile/patches/non-static.patch
deleted file mode 100644
index 8896762df89..00000000000
--- a/srcpkgs/guile/patches/non-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libguile/finalizers.c 2014-05-02 15:15:57.000000000 +0200
-+++ libguile/finalizers.c 2019-01-04 14:32:52.336586516 +0100
-@@ -164,7 +164,7 @@
- \f
-
- #ifndef HAVE_GC_SET_FINALIZER_NOTIFIER
--static void
-+void
- GC_set_finalizer_notifier (void (*notifier) (void))
- {
- GC_finalizer_notifier = notifier;
---- libguile/gc.c 2016-12-15 01:03:33.000000000 +0100
-+++ libguile/gc.c 2019-01-04 14:35:56.357579179 +0100
-@@ -196,7 +196,7 @@
- /* Compatibility. */
-
- #ifndef HAVE_GC_GET_HEAP_USAGE_SAFE
--static void
-+void
- GC_get_heap_usage_safe (GC_word *pheap_size, GC_word *pfree_bytes,
- GC_word *punmapped_bytes, GC_word *pbytes_since_gc,
- GC_word *ptotal_bytes)
-@@ -214,7 +214,7 @@
- #endif
-
- #ifndef HAVE_GC_GET_FREE_SPACE_DIVISOR
--static GC_word
-+GC_word
- GC_get_free_space_divisor (void)
- {
- return GC_free_space_divisor;
-@@ -586,7 +586,7 @@
- }
-
- #ifndef HAVE_GC_SET_FINALIZE_ON_DEMAND
--static void
-+void
- GC_set_finalize_on_demand (int foo)
- {
- GC_finalize_on_demand = foo;
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index ffea17c3846..787df2cf02c 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,18 +1,18 @@
# Template file for 'guile'
pkgname=guile
-version=2.0.14
-revision=9
+version=3.0.2
+revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-error-on-warning"
hostmakedepends="pkg-config texinfo"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
libunistring-devel readline-devel"
-short_desc="A portable, embeddable Scheme implementation written in C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="http://www.gnu.org/software/${pkgname}"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
subpackages="libguile guile-devel"
if [ "$CROSS_BUILD" ]; then
@@ -31,7 +31,7 @@ libguile_package() {
short_desc+=" - runtime library"
pkg_install() {
vmove "usr/lib/*.so.*"
- vmove "usr/lib/libguilereadline*.so"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
vmkdir usr/share/gdb/auto-load/usr/lib
mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
}
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..c7e1c07b217
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+build_style=gnu-configure
+wrksrc=guile-${version}
+configure_args="--disable-static --disable-error-on-warning"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+ # Need host guile to cross compile
+ hostmakedepends+=" guile"
+fi
+
+pre_configure() {
+ # magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+ case "$XBPS_TARGET_MACHINE" in
+ ppc*) export CFLAGS+=" -Os";;
+ esac
+}
+
+libguile3_package() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+ vmkdir usr/share/gdb/auto-load/usr/lib
+ mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+ }
+}
+
+guile3-devel_package() {
+ short_desc+=" - development files"
+ depends="gmp-devel gc-devel guile>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/bin/guile-config
+ vmove usr/include
+ vmove usr/share/aclocal
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (12 preceding siblings ...)
2020-05-27 1:43 ` [PR PATCH] [Updated] " anjandev
@ 2020-05-27 2:05 ` anjandev
2020-05-27 2:05 ` [PR PATCH] [Closed]: " anjandev
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 2:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
New package: guile3-3.0.2
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Closed]: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (13 preceding siblings ...)
2020-05-27 2:05 ` anjandev
@ 2020-05-27 2:05 ` anjandev
2020-05-27 3:06 ` [PR PATCH] [Updated] " anjandev
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 2:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
There's a closed pull request on the void-packages repository
New package: guile3-3.0.2
https://github.com/void-linux/void-packages/pull/22304
Description:
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (14 preceding siblings ...)
2020-05-27 2:05 ` [PR PATCH] [Closed]: " anjandev
@ 2020-05-27 3:06 ` anjandev
2020-05-27 3:07 ` anjandev
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 3:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
New package: guile3-3.0.2
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 2998 bytes --]
From 491a6eeeecd8b091c164589b2bf5a74e534f48ea Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 20:01:03 -0700
Subject: [PATCH] New package: guile3-3.0.2
---
common/shlibs | 2 ++
srcpkgs/guile3-devel | 1 +
srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++
srcpkgs/libguile3 | 1 +
4 files changed, 55 insertions(+)
create mode 120000 srcpkgs/guile3-devel
create mode 100644 srcpkgs/guile3/template
create mode 120000 srcpkgs/libguile3
diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..28500f05769 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..4e6bcea2790
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+ # Need host guile to cross compile
+ hostmakedepends+=" guile"
+fi
+
+pre_configure() {
+ # magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+ case "$XBPS_TARGET_MACHINE" in
+ ppc*) export CFLAGS+=" -Os";;
+ esac
+}
+
+libguile3_package() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+ vmkdir usr/share/gdb/auto-load/usr/lib
+ mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+ }
+}
+
+guile3-devel_package() {
+ short_desc+=" - development files"
+ depends="gmp-devel gc-devel guile>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/bin/guile-config
+ vmove usr/include
+ vmove usr/share/aclocal
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (15 preceding siblings ...)
2020-05-27 3:06 ` [PR PATCH] [Updated] " anjandev
@ 2020-05-27 3:07 ` anjandev
2020-05-27 4:16 ` ericonr
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 3:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by anjandev against master on the void-packages repository
https://github.com/anjandev/void-packages guile
https://github.com/void-linux/void-packages/pull/22304
New package: guile3-3.0.2
A patch file from https://github.com/void-linux/void-packages/pull/22304.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-guile-22304.patch --]
[-- Type: text/x-diff, Size: 2998 bytes --]
From 946bb989f26248a2564505a262228bc5260c3d51 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 26 May 2020 20:01:03 -0700
Subject: [PATCH] New package: guile3-3.0.2
---
common/shlibs | 2 ++
srcpkgs/guile3-devel | 1 +
srcpkgs/guile3/template | 51 +++++++++++++++++++++++++++++++++++++++++
srcpkgs/libguile3 | 1 +
4 files changed, 55 insertions(+)
create mode 120000 srcpkgs/guile3-devel
create mode 100644 srcpkgs/guile3/template
create mode 120000 srcpkgs/libguile3
diff --git a/common/shlibs b/common/shlibs
index f18df7266ff..28500f05769 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3889,3 +3889,5 @@ libvips.so.42 libvips-8.9.2_1
libvips-cpp.so.42 libvips-8.9.2_1
libselinux.so.1 libselinux-3.0_1
libsepol.so.1 libsepol-3.0_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1
diff --git a/srcpkgs/guile3-devel b/srcpkgs/guile3-devel
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/guile3-devel
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
diff --git a/srcpkgs/guile3/template b/srcpkgs/guile3/template
new file mode 100644
index 00000000000..4e6bcea2790
--- /dev/null
+++ b/srcpkgs/guile3/template
@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+subpackages="libguile3 guile3-devel"
+
+if [ "$CROSS_BUILD" ]; then
+ # Need host guile to cross compile
+ hostmakedepends+=" guile"
+fi
+
+pre_configure() {
+ # magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+ case "$XBPS_TARGET_MACHINE" in
+ ppc*) export CFLAGS+=" -Os";;
+ esac
+}
+
+libguile3_package() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+ vmkdir usr/share/gdb/auto-load/usr/lib
+ mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+ }
+}
+
+guile3-devel_package() {
+ short_desc+=" - development files"
+ depends="gmp-devel gc-devel guile>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/bin/guile-config
+ vmove usr/include
+ vmove usr/share/aclocal
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libguile3 b/srcpkgs/libguile3
new file mode 120000
index 00000000000..1cd5714f5e9
--- /dev/null
+++ b/srcpkgs/libguile3
@@ -0,0 +1 @@
+guile3
\ No newline at end of file
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (16 preceding siblings ...)
2020-05-27 3:07 ` anjandev
@ 2020-05-27 4:16 ` ericonr
2020-05-27 4:21 ` ericonr
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-05-27 4:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634417771
Comment:
`guile3-devel` is depending on `guile` instead of `guile3`.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (17 preceding siblings ...)
2020-05-27 4:16 ` ericonr
@ 2020-05-27 4:21 ` ericonr
2020-05-27 4:22 ` ericonr
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-05-27 4:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634419042
Comment:
You also need to rename the `guile`, `guild` and `guile-snarf` binaries. We might have to look into an alternatives group, actually.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (18 preceding siblings ...)
2020-05-27 4:21 ` ericonr
@ 2020-05-27 4:22 ` ericonr
2020-05-27 5:08 ` anjandev
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-05-27 4:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634419215
Comment:
I can adopt the PR, if you don't want to work on this stuff.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (19 preceding siblings ...)
2020-05-27 4:22 ` ericonr
@ 2020-05-27 5:08 ` anjandev
2020-05-27 5:08 ` anjandev
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 5:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by anjandev on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634431535
Comment:
Please adopt this PR.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (20 preceding siblings ...)
2020-05-27 5:08 ` anjandev
@ 2020-05-27 5:08 ` anjandev
2020-05-27 15:08 ` ericonr
2020-08-03 22:53 ` [PR PATCH] [Closed]: " anjandev
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-05-27 5:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by anjandev on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634431535
Comment:
@ericonr Please adopt this PR.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (21 preceding siblings ...)
2020-05-27 5:08 ` anjandev
@ 2020-05-27 15:08 ` ericonr
2020-08-03 22:53 ` [PR PATCH] [Closed]: " anjandev
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2020-05-27 15:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22304#issuecomment-634726614
Comment:
I'm doing everything locally, as soon as I have it in a reasonable state I can make a new PR.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Closed]: New package: guile3-3.0.2
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
` (22 preceding siblings ...)
2020-05-27 15:08 ` ericonr
@ 2020-08-03 22:53 ` anjandev
23 siblings, 0 replies; 25+ messages in thread
From: anjandev @ 2020-08-03 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
There's a closed pull request on the void-packages repository
New package: guile3-3.0.2
https://github.com/void-linux/void-packages/pull/22304
Description:
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2020-08-03 22:53 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 3:48 [PR PATCH] guile: update to 3.0.2 anjandev
2020-05-26 3:52 ` ericonr
2020-05-26 3:55 ` [PR PATCH] [Updated] " anjandev
2020-05-26 3:57 ` anjandev
2020-05-26 3:57 ` anjandev
2020-05-26 4:01 ` anjandev
2020-05-26 6:32 ` fosslinux
2020-05-26 7:30 ` travankor
2020-05-26 17:49 ` ericonr
2020-05-26 23:07 ` [PR PATCH] [Updated] " anjandev
2020-05-27 1:32 ` [PR PATCH] [Updated] New package: guile3-3.0.2 anjandev
2020-05-27 1:37 ` anjandev
2020-05-27 1:42 ` ericonr
2020-05-27 1:43 ` [PR PATCH] [Updated] " anjandev
2020-05-27 2:05 ` anjandev
2020-05-27 2:05 ` [PR PATCH] [Closed]: " anjandev
2020-05-27 3:06 ` [PR PATCH] [Updated] " anjandev
2020-05-27 3:07 ` anjandev
2020-05-27 4:16 ` ericonr
2020-05-27 4:21 ` ericonr
2020-05-27 4:22 ` ericonr
2020-05-27 5:08 ` anjandev
2020-05-27 5:08 ` anjandev
2020-05-27 15:08 ` ericonr
2020-08-03 22:53 ` [PR PATCH] [Closed]: " anjandev
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).