* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-ssh/files/, dev-scheme/guile-ssh/
@ 2023-02-21 23:54 Maciej Barć
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2023-02-21 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 5c573a6e251628f75892e0363b0b2f9ec14f49d2
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 22:45:47 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 23:54:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c573a6e
dev-scheme/guile-ssh: fix build on musl
Closes: https://bugs.gentoo.org/877721
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch | 12 ++++++++++++
dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild | 8 ++++++--
dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild | 5 ++++-
dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild | 5 ++++-
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch b/dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch
new file mode 100644
index 000000000000..3f8c7d2eee42
--- /dev/null
+++ b/dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch
@@ -0,0 +1,12 @@
+diff --git a/libguile-ssh/log.c b/libguile-ssh/log.c_
+index e0c7ac9..820871c 100644
+--- a/libguile-ssh/log.c
++++ b/libguile-ssh/log.c_
+@@ -29,7 +29,6 @@
+ #include <stdio.h> /* DEBUG */
+ #include <unistd.h> /* DEBUG */
+
+-#include <execinfo.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
index fe67b2f16774..009a47427955 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
RDEPEND="
>=dev-scheme/guile-2.0.0:=
@@ -22,7 +23,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.16.0-musl.patch
+ "${FILESDIR}"/${P}-tests.patch
+)
# guile generates ELF files without use of C or machine code
# It's a portage's false positive. bug #677600
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
index 3852b3ec27fc..009a47427955 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
@@ -23,7 +23,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.16.0-musl.patch
+ "${FILESDIR}"/${P}-tests.patch
+)
# guile generates ELF files without use of C or machine code
# It's a portage's false positive. bug #677600
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
index 2ca0c04b0260..08853faeea69 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
@@ -23,7 +23,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-PATCHES=( "${FILESDIR}"/${PN}-0.16.2-tests.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.16.0-musl.patch
+ "${FILESDIR}"/${PN}-0.16.2-tests.patch
+)
# guile generates ELF files without use of C or machine code
# It's a portage's false positive. bug #677600
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-ssh/files/, dev-scheme/guile-ssh/
@ 2023-04-03 1:56 Maciej Barć
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2023-04-03 1:56 UTC (permalink / raw
To: gentoo-commits
commit: 4d73fa0bd21ade4762bc0d6ff058276e54db57a5
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 3 01:45:37 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Apr 3 01:56:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d73fa0b
dev-scheme/guile-ssh: remove broken patch
Bug: https://bugs.gentoo.org/877721
Closes: https://bugs.gentoo.org/903689
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch | 10 ----------
dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild | 2 +-
dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild | 2 +-
dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild | 2 +-
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch b/dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch
deleted file mode 100644
index 6ac51126ebc8..000000000000
--- a/dev-scheme/guile-ssh/files/guile-ssh-0.16.0-musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libguile-ssh/log.c
-+++ b/libguile-ssh/log.c
-@@ -29,7 +29,6 @@
- #include <stdio.h> /* DEBUG */
- #include <unistd.h> /* DEBUG */
-
--#include <execinfo.h>
- #include <stdlib.h>
- #include <stdio.h>
-
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
index 009a47427955..62795115eda9 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="elibc_glibc"
RESTRICT="strip"
RDEPEND="
@@ -24,7 +25,6 @@ DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
PATCHES=(
- "${FILESDIR}"/${PN}-0.16.0-musl.patch
"${FILESDIR}"/${P}-tests.patch
)
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
index 009a47427955..62795115eda9 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="elibc_glibc"
RESTRICT="strip"
RDEPEND="
@@ -24,7 +25,6 @@ DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
PATCHES=(
- "${FILESDIR}"/${PN}-0.16.0-musl.patch
"${FILESDIR}"/${P}-tests.patch
)
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
index 08853faeea69..129ad56fc00b 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.3.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="elibc_glibc"
RESTRICT="strip"
RDEPEND="
@@ -24,7 +25,6 @@ DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
PATCHES=(
- "${FILESDIR}"/${PN}-0.16.0-musl.patch
"${FILESDIR}"/${PN}-0.16.2-tests.patch
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-ssh/files/, dev-scheme/guile-ssh/
@ 2025-05-05 15:38 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-05-05 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 088b424f14b496d93768114a58aacb8ffcf0dcbb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 5 15:37:43 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 5 15:37:43 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088b424f
dev-scheme/guile-ssh: fix build w/ c23
Closes: https://bugs.gentoo.org/942958
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../guile-ssh/files/guile-ssh-0.16.4-c23.patch | 33 ++++++++++++++++++++++
dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild | 3 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/dev-scheme/guile-ssh/files/guile-ssh-0.16.4-c23.patch b/dev-scheme/guile-ssh/files/guile-ssh-0.16.4-c23.patch
new file mode 100644
index 000000000000..1e7502060b89
--- /dev/null
+++ b/dev-scheme/guile-ssh/files/guile-ssh-0.16.4-c23.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/942958
+https://github.com/artyom-poptsov/guile-ssh/pull/43
+
+From 30fc103c67f3bf6cd30b17379ba966b260cfa534 Mon Sep 17 00:00:00 2001
+From: Peter Tillemans <pti@snamellit.com>
+Date: Wed, 18 Sep 2024 15:52:46 +0200
+Subject: [PATCH] fix compile error caused by bool identifier
+
+confusion of variable name with typename is now an error.
+---
+ libguile-ssh/session-func.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c
+index 7006b62..836cd27 100644
+--- a/libguile-ssh/session-func.c
++++ b/libguile-ssh/session-func.c
+@@ -234,12 +234,12 @@ set_int32_opt (ssh_session session, int type, SCM value)
+ static inline int
+ set_bool_opt (ssh_session session, int type, SCM value)
+ {
+- int32_t bool;
++ int32_t bool_value;
+
+ SCM_ASSERT (scm_is_bool (value), value, SCM_ARG3, "session-set!");
+
+- bool = scm_to_bool (value);
+- return ssh_options_set (session, type, &bool);
++ bool_value = scm_to_bool (value);
++ return ssh_options_set (session, type, &bool_value);
+ }
+
+ /* Convert VALUE to a socket file descriptor and pass it to
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild
index 2de52a2e3291..3202fdb834b5 100644
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild
+++ b/dev-scheme/guile-ssh/guile-ssh-0.16.4-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -43,6 +43,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
PATCHES=(
"${FILESDIR}/${PN}-0.16.2-tests.patch"
+ "${FILESDIR}/${PN}-0.16.4-c23.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-05 15:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-05 15:38 [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-ssh/files/, dev-scheme/guile-ssh/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-03 1:56 Maciej Barć
2023-02-21 23:54 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox