From: anjandev <anjandev@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: guile3-3.0.2
Date: Wed, 27 May 2020 03:32:50 +0200 [thread overview]
Message-ID: <20200527013250.feRruXEvVl0LTwvtPRU4606sNWAfqzlFCNrBfiAjyZ8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22304@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-05-27 1:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` anjandev [this message]
2020-05-27 1:37 ` New package: guile3-3.0.2 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
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=20200527013250.feRruXEvVl0LTwvtPRU4606sNWAfqzlFCNrBfiAjyZ8@z \
--to=anjandev@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).