* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2015-10-12 23:24 Ryan Hill
0 siblings, 0 replies; 6+ messages in thread
From: Ryan Hill @ 2015-10-12 23:24 UTC (permalink / raw
To: gentoo-commits
commit: db9b115582ff1e2135acda0f3e74d79bc6b093fd
Author: Ryan Hill <rhill <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 05:58:54 2015 +0000
Commit: Ryan Hill <rhill <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 23:26:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db9b1155
dev-scheme/guile: Make building guile-readline optional (bug #392553)
dev-scheme/guile/files/guile-1.8.8-readline.patch | 34 +++++++++++++++++++++++
dev-scheme/guile/guile-1.8.8-r2.ebuild | 8 ++++--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/dev-scheme/guile/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch
new file mode 100644
index 0000000..68f64c52
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-readline.patch
@@ -0,0 +1,34 @@
+Make guile-readline optional
+
+https://bugs.gentoo.org/392553
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,7 +24,7 @@
+ #
+ AUTOMAKE_OPTIONS = 1.10
+
+-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \
++SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \
+ scripts srfi doc examples test-suite benchmark-suite lang am
+
+ bin_SCRIPTS = guile-tools
+--- a/configure.in
++++ b/configure.in
+@@ -57,7 +57,15 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
+ #
+ #--------------------------------------------------------------------
+
+-AC_CONFIG_SUBDIRS(guile-readline)
++GUILE_READLINE=
++AC_ARG_ENABLE([readline],
++ [AS_HELP_STRING([--disable-readline],
++ [disable building guile-readline])],
++ if test "x$enable_readline" != xno; then
++ AC_CONFIG_SUBDIRS([guile-readline])
++ GUILE_READLINE="guile-readline"
++ fi)
++AC_SUBST([GUILE_READLINE])
+
+ #--------------------------------------------------------------------
+
diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
index 2856054..b638126 100644
--- a/dev-scheme/guile/guile-1.8.8-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -11,7 +11,8 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-2.1"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads"
+IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
+
RESTRICT="!regex? ( test )"
RDEPEND="
@@ -19,7 +20,8 @@ RDEPEND="
dev-libs/libltdl:0=
sys-devel/gettext
sys-libs/ncurses:0=
- emacs? ( virtual/emacs )"
+ emacs? ( virtual/emacs )
+ readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND}
sys-apps/texinfo
sys-devel/libtool"
@@ -36,6 +38,7 @@ src_prepare() {
"${FILESDIR}/${P}-gcc5.patch" \
"${FILESDIR}/${P}-makeinfo-5.patch" \
"${FILESDIR}/${P}-gtexinfo-5.patch" \
+ "${FILESDIR}/${P}-readline.patch" \
"${FILESDIR}/${P}-tinfo.patch" \
"${FILESDIR}/${P}-sandbox.patch"
@@ -62,6 +65,7 @@ src_configure() {
--disable-static \
--enable-posix \
$(use_enable networking) \
+ $(use_enable readline) \
$(use_enable regex) \
$(use deprecated || use_enable discouraged) \
$(use_enable deprecated) \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2016-07-29 13:17 Amy Winston
0 siblings, 0 replies; 6+ messages in thread
From: Amy Winston @ 2016-07-29 13:17 UTC (permalink / raw
To: gentoo-commits
commit: 2f7dd04bc9415896ed8b86a8badfaa12fd11e5f5
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 13:12:47 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 13:12:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7dd04b
dev-scheme/guile: remove broken version 2.0.0
Package-Manager: portage-2.2.28
dev-scheme/guile/Manifest | 1 -
.../files/guile-2.0.0-clang-apicontrol-texi.patch | 12 ---
dev-scheme/guile/guile-2.0.0.ebuild | 95 ----------------------
3 files changed, 108 deletions(-)
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 2b9298c..a04fe8e 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -1,2 +1 @@
DIST guile-1.8.8.tar.gz 3956654 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 WHIRLPOOL 104810030b5dae16805595a5b398e5a7e600771b64b08d5ff686036e2f273dcec3829a16e4cdb1dbb9db5813f2e225476f83e0535a789bc570fc2fc15a76dbe2
-DIST guile-2.0.0.tar.gz 5564966 SHA256 7ba4ebd54d5b16840424172a14b2d10c76821bda9336fab5055b29fc288ec67b SHA512 44b5b703455eed28fc3981a067d8e0afd47b73bceb4d161c8d1db763db59adeb4add661424a41691bd00c7f4c54c5b02fefe9cd6cf94250eabab04848a2db3b2 WHIRLPOOL 066fcec5cffc217e233eb7c83eaef4fbbdaac7ada15acef5ebb2fbb937b8060c795a365bdc4c361965e452258db6d87bc637706370d951a2ed57f7337c52c06c
diff --git a/dev-scheme/guile/files/guile-2.0.0-clang-apicontrol-texi.patch b/dev-scheme/guile/files/guile-2.0.0-clang-apicontrol-texi.patch
deleted file mode 100644
index cbd3f46..0000000
--- a/dev-scheme/guile/files/guile-2.0.0-clang-apicontrol-texi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/doc/ref/api-control.texi 2016-06-23 03:35:29.973976657 -0500
-+++ b/doc/ref/api-control.texi 2016-06-23 03:33:36.589969005 -0500
-@@ -1492,8 +1492,8 @@
- @deftypefnx {C Function} void scm_wrong_type_arg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value})
- @deftypefnx {C Function} void scm_wrong_type_arg_msg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value}, const char *@var{expected})
- @deftypefnx {C Function} void scm_memory_error (char *@var{subr})
--Throw an error with the various keys described above.
- @deftypefnx {C Function} void scm_misc_error (const char *@var{subr}, const char *@var{message}, SCM @var{args})
-+Throw an error with the various keys described above.
-
- In @code{scm_wrong_num_args}, @var{proc} should be a Scheme symbol
- which is the name of the procedure incorrectly invoked. The other
diff --git a/dev-scheme/guile/guile-2.0.0.ebuild b/dev-scheme/guile/guile-2.0.0.ebuild
deleted file mode 100644
index e5204ae..0000000
--- a/dev-scheme/guile/guile-2.0.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit flag-o-matic elisp-common
-
-DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
-HOMEPAGE="https://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64"
-IUSE="networking +regex +deprecated emacs nls debug-freelist debug-malloc debug +threads"
-
-RDEPEND="
- dev-libs/gmp
- >=sys-devel/libtool-1.5.6
- sys-devel/gettext
- virtual/pkgconfig
- dev-libs/libunistring
- >=dev-libs/boehm-gc-7.0[threads?]
- virtual/libffi
- sys-libs/ncurses
- emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
- sys-apps/texinfo"
-
-SLOT="2"
-MAJOR="2.0"
-
-PATCHES=(
- "${FILESDIR}/${P}-clang-apicontrol-texi.patch"
- )
-
-src_configure() {
- # see bug #178499
- filter-flags -ftree-vectorize
-
- # will fail for me if posix is disabled or without modules -- hkBst
- econf \
- --disable-error-on-warning \
- --disable-static \
- --enable-posix \
- $(use_enable networking) \
- $(use_enable regex) \
- $(use_enable deprecated) \
- $(use_enable nls) \
- --disable-rpath \
- $(use_enable debug-freelist) \
- $(use_enable debug-malloc) \
- $(use_enable debug guile-debug) \
- $(use_with threads) \
- --with-modules # \
-# EMACS=no
-}
-
-src_install() {
- default
-
- dodoc GUILE-VERSION HACKING
-
- # texmacs needs this, closing bug #23493
- dodir /etc/env.d
- echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" \
- > "${ED}"/etc/env.d/50guile || die
-
- # necessary for registering slib, see bug 206896
- keepdir /usr/share/guile/site
-
- # if use emacs; then
- # elisp-install ${PN} emacs/*.{el,elc} || die
- # elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
- # fi
-}
-
-pkg_postinst() {
- [ "${EROOT}" == "/" ] && pkg_config
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
-
-pkg_config() {
- if has_version dev-scheme/slib; then
- einfo "Registering slib with guile"
- install_slib_for_guile
- fi
-}
-
-_pkg_prerm() {
- rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2016-11-06 19:13 Amy Winston
0 siblings, 0 replies; 6+ messages in thread
From: Amy Winston @ 2016-11-06 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 5fda0962579cd0d6ec0e7ebf22bec1b4685be0bd
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 19:08:45 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 19:13:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fda0962
dev-scheme/guile: add unmask patch bug #596864
Package-Manager: portage-2.3.0
.../guile/files/guile-1.8.8-mkdir-mask.patch | 35 ++++++
dev-scheme/guile/guile-1.8.8-r3.ebuild | 120 +++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch b/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch
new file mode 100644
index 00000000..7d1c703
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch
@@ -0,0 +1,35 @@
+--- a/libguile/filesys.c 2016-11-05 15:03:52.131894648 +0100
++++ b/libguile/filesys.c 2016-11-05 15:07:13.275894481 +0100
+@@ -791,24 +791,18 @@
+ SCM_DEFINE (scm_mkdir, "mkdir", 1, 1, 0,
+ (SCM path, SCM mode),
+ "Create a new directory named by @var{path}. If @var{mode} is omitted\n"
+- "then the permissions of the directory file are set using the current\n"
+- "umask. Otherwise they are set to the decimal value specified with\n"
+- "@var{mode}. The return value is unspecified.")
++ "then the permissions of the directory are set to @code{#o777}\n"
++ "masked with the current umask (@pxref{Processes, @code{umask}}).\n"
++ "Otherwise they are set to the value specified with @var{mode}.\n"
++ "The return value is unspecified.")
+ #define FUNC_NAME s_scm_mkdir
+ {
+ int rv;
+- mode_t mask;
++ mode_t c_mode;
+
+- if (SCM_UNBNDP (mode))
+- {
+- mask = umask (0);
+- umask (mask);
+- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, 0777 ^ mask));
+- }
+- else
+- {
+- STRING_SYSCALL (path, c_path, rv = mkdir (c_path, scm_to_uint (mode)));
+- }
++ c_mode = SCM_UNBNDP (mode) ? 0777 : scm_to_uint (mode);
++
++ STRING_SYSCALL (path, c_path, rv = mkdir (c_path, c_mode));
+ if (rv != 0)
+ SCM_SYSERROR;
+ return SCM_UNSPECIFIED;
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
new file mode 100644
index 00000000..5d5a73f
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools flag-o-matic elisp-common
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
+
+RESTRICT="!regex? ( test )"
+
+RDEPEND="
+ >=dev-libs/gmp-4.1:0=
+ dev-libs/libltdl:0=
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ emacs? ( virtual/emacs )
+ readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ sys-devel/libtool"
+
+# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
+# but there are lots of collisions. Most in /usr/share/libguile. Therefore
+# I'm slotting this in the same slot as guile-1.6* for now.
+SLOT="12/8"
+MAJOR="1.8"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
+ "${FILESDIR}/${P}-gcc46.patch" \
+ "${FILESDIR}/${P}-gcc5.patch" \
+ "${FILESDIR}/${P}-makeinfo-5.patch" \
+ "${FILESDIR}/${P}-gtexinfo-5.patch" \
+ "${FILESDIR}/${P}-readline.patch" \
+ "${FILESDIR}/${P}-tinfo.patch" \
+ "${FILESDIR}/${P}-sandbox.patch" \
+ "${FILESDIR}/${P}-mkdir-mask.patch"
+
+ sed \
+ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
+ -e "/AM_PROG_CC_STDC/d" \
+ -i guile-readline/configure.in || die
+
+ epatch_user
+
+ mv "${S}"/configure.{in,ac} || die
+ mv "${S}"/guile-readline/configure.{in,ac} || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # see bug #178499
+ filter-flags -ftree-vectorize
+
+ #will fail for me if posix is disabled or without modules -- hkBst
+ econf \
+ --disable-error-on-warning \
+ --disable-static \
+ --enable-posix \
+ $(use_enable networking) \
+ $(use_enable readline) \
+ $(use_enable regex) \
+ $(use deprecated || use_enable discouraged) \
+ $(use_enable deprecated) \
+ $(use_enable emacs elisp) \
+ $(use_enable nls) \
+ --disable-rpath \
+ $(use_enable debug-freelist) \
+ $(use_enable debug-malloc) \
+ $(use_enable debug guile-debug) \
+ $(use_with threads) \
+ --with-modules \
+ EMACS=no
+}
+
+src_compile() {
+ emake
+
+ # Above we have disabled the build system's Emacs support;
+ # for USE=emacs we compile (and install) the files manually
+ if use emacs; then
+ cd emacs || die
+ elisp-compile *.el || die
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
+
+ # texmacs needs this, closing bug #23493
+ dodir /etc/env.d
+ echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile || die
+
+ # necessary for registering slib, see bug 206896
+ keepdir /usr/share/guile/site
+
+ if use emacs; then
+ elisp-install ${PN} emacs/*.{el,elc} || die
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+ fi
+}
+
+pkg_postinst() {
+ [ "${EROOT}" == "/" ] && pkg_config
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2020-10-05 19:04 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-10-05 19:04 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2857 bytes --]
commit: 3f32eaf545ba48564c1ba109fc2792079257032b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 5 19:03:20 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 5 19:03:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f32eaf5
dev-scheme/guile: fix 1.8.8 build with >=sys-apps/texinfo-6.7
Drop unicode.
Thanks-to: Dennis Nezic <dennisn <AT> dennisn.mooo.com>
Closes: https://bugs.gentoo.org/736469
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../guile/files/guile-1.8.8-texinfo-6.7.patch | 22 ++++++++++++++++++++++
dev-scheme/guile/guile-1.8.8-r3.ebuild | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/dev-scheme/guile/files/guile-1.8.8-texinfo-6.7.patch b/dev-scheme/guile/files/guile-1.8.8-texinfo-6.7.patch
new file mode 100644
index 00000000000..6be52017a8d
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-texinfo-6.7.patch
@@ -0,0 +1,22 @@
+--- a/doc/ref/api-compound.texi.orig 2020-08-08 22:23:07.000000000 -0400
++++ b/doc/ref/api-compound.texi 2020-08-08 22:23:33.000000000 -0400
+@@ -905,7 +905,7 @@
+ @end deftypefn
+
+ @deftypefn {C Function} {const SCM *} scm_vector_elements (SCM vec, scm_t_array_handle *handle, size_t *lenp, ssize_t *incp)
+-Acquire a handle for the vector @var{vec} and return a pointer to the
++Acquire a handle for the vector @var{vec} and return a pointer to the
+ elements of it. This pointer can only be used to read the elements of
+ @var{vec}. When @var{vec} is not a vector, an error is signaled. The
+ handle mustr eventually be released with
+--- a/doc/ref/guile.info-2.orig 2020-08-08 22:22:59.000000000 -0400
++++ b/doc/ref/guile.info-2 2020-08-08 22:25:21.000000000 -0400
+@@ -4192,7 +4192,7 @@
+
+ -- C Function: const SCM * scm_vector_elements (SCM vec,
+ scm_t_array_handle *handle, size_t *lenp, ssize_t *incp)
+- Acquire a handle for the vector VEC and return a pointer to the
++ Acquire a handle for the vector VEC and return a pointer to the
+ elements of it. This pointer can only be used to read the
+ elements of VEC. When VEC is not a vector, an error is signaled.
+ The handle mustr eventually be released with
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
index bd0e2037354..48800f8ea22 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -40,7 +40,8 @@ src_prepare() {
"${FILESDIR}/${P}-readline.patch" \
"${FILESDIR}/${P}-tinfo.patch" \
"${FILESDIR}/${P}-sandbox.patch" \
- "${FILESDIR}/${P}-mkdir-mask.patch"
+ "${FILESDIR}/${P}-mkdir-mask.patch" \
+ "${FILESDIR}/${PN}-1.8.8-texinfo-6.7.patch"
sed \
-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2023-01-04 4:32 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-01-04 4:32 UTC (permalink / raw
To: gentoo-commits
commit: ddfb19b4eb6b47da689efcda26a76ae421baab2a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 04:09:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 04:31:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfb19b4
dev-scheme/guile: fix configure w/ clang 16 (2.0.x)
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/guile-2.0.14-configure-clang16.patch | 71 ++++++++++++++++++++++
...ile-2.0.14-r4.ebuild => guile-2.0.14-r5.ebuild} | 15 ++---
2 files changed, 79 insertions(+), 7 deletions(-)
diff --git a/dev-scheme/guile/files/guile-2.0.14-configure-clang16.patch b/dev-scheme/guile/files/guile-2.0.14-configure-clang16.patch
new file mode 100644
index 000000000000..361cc01b97c0
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.0.14-configure-clang16.patch
@@ -0,0 +1,71 @@
+https://src.fedoraproject.org/rpms/guile/c/7fcab121be7d2bc8e3e48d0da476127b86cec90c?branch=rawhide
+
+These issues have already been fixed upstream via gnulib imports:
+
+commit 7e641595cd9b45ce7339e21c20a8ab81af9278f6
+Author: Andy Wingo <wingo@pobox.com>
+Date: Wed Feb 15 21:41:24 2017 +0100
+
+ Update Gnulib to v0.1-1157-gb03f418.
+
+commit a91b95cca2d397c84f8b9bbd602d40209a7092ce
+Author: Andy Wingo <wingo@pobox.com>
+Date: Wed Jan 20 21:52:54 2021 +0100
+
+ Update Gnulib to v0.1-4379-g2ef5a9b4b
+
+ Also bump required autoconf version to 2.64, as required by Gnulib.
+
+--- a/m4/link.m4
++++ b/m4/link.m4
+@@ -22,6 +22,7 @@ AC_DEFUN([gl_FUNC_LINK],
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <unistd.h>
++ #include <stdio.h>
+ ]],
+ [[int result = 0;
+ if (!link ("conftest.a", "conftest.b/"))
+--- a/m4/round.m4
++++ b/m4/round.m4
+@@ -57,7 +57,7 @@ int main()
+ * (double) (1U << ((DBL_MANT_DIG + 3) / 5))
+ * (double) (1U << ((DBL_MANT_DIG + 4) / 5));
+ volatile double x = 0.5 - 0.5 / TWO_MANT_DIG;
+- exit (x < 0.5 && round (x) != 0.0);
++ return x < 0.5 && round (x) != 0.0;
+ }]])], [gl_cv_func_round_works=yes], [gl_cv_func_round_works=no],
+ [case "$host_os" in
+ netbsd* | aix*) gl_cv_func_round_works="guessing no";;
+
+
+Avoid implicit ints in the guile_cv_localtime_cache check. It cause
+the check to always fail with strict(er) C99 compilers that do not
+support implicit int.
+
+Submitted upstream:
+
+ <https://lists.gnu.org/archive/html/bug-guile/2022-12/msg00017.html>
+ <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60022>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1086,7 +1086,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <time.h>
+ # include <stdlib.h>
+ #endif
+ extern char **environ;
+-unset_TZ ()
++int unset_TZ ()
+ {
+ char **from, **to;
+ for (to = from = environ; (*to = *from); from++)
+@@ -1095,7 +1095,7 @@ unset_TZ ()
+ }
+ char TZ_GMT0[] = "TZ=GMT0";
+ char TZ_PST8[] = "TZ=PST8";
+-main()
++int main()
+ {
+ time_t now = time ((time_t *) 0);
+ int hour_GMT0, hour_unset;
+
diff --git a/dev-scheme/guile/guile-2.0.14-r4.ebuild b/dev-scheme/guile/guile-2.0.14-r5.ebuild
similarity index 95%
rename from dev-scheme/guile/guile-2.0.14-r4.ebuild
rename to dev-scheme/guile/guile-2.0.14-r5.ebuild
index 0eb8e1fedb21..2ea5568add42 100644
--- a/dev-scheme/guile/guile-2.0.14-r4.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r5.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=6
@@ -33,18 +33,19 @@ DEPEND="${RDEPEND}
SLOT="12/22" # subslot is soname version
MAJOR="2.0"
+# guile generates ELF files without use of C or machine code
+# It's a false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+DOCS=( GUILE-VERSION HACKING README )
+
PATCHES=(
"${FILESDIR}/${PN}-2-snarf.patch"
"${FILESDIR}/${P}-darwin.patch"
"${FILESDIR}/${P}-ia64-fix-crash-thread-context-switch.patch"
+ "${FILESDIR}/${P}-configure-clang16.patch"
)
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-DOCS=( GUILE-VERSION HACKING README )
-
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
@ 2024-05-30 2:21 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-05-30 2:21 UTC (permalink / raw
To: gentoo-commits
commit: 12a43f5f35a998543b802c8c37c9908232010fbc
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun May 26 17:27:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 30 02:20:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a43f5f
dev-scheme/guile: fix implicit function decls in configure due to gnulib
backport fix for round.m4, exit() -> return
Also fix bashism:
test $var = no
fails if $var is only ever defined after this line. gnulib is brilliant
software and naturally does exactly this, because it is highly logical
to only define code after you try to use it.
Probably. It's hard to tell because the actual code that gets run is:
func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31
since the other sparkling aspect of gnulib's innovative brilliance is
the realization that *of course* the most robust way to design software
is to use checksums as *replacements* for function names.
Or, "that time Eli got jiatanned by gnulib".
The quoting was silently "fixed" upstream in:
https://github.com/coreutils/gnulib/commit/db1ee11e2168af7137db53289a92e306d2277b0b
It is the same "fix" we do here, thus restoring dash <--> bash
compatibility and preventing:
```
* QA Notice: Abnormal configure code
*
* ./configure: 38012: test: =: unexpected operator
```
although it seems to me gnulib is just more generally broken.
Closes: https://bugs.gentoo.org/900346
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../guile/files/guile-2.2.7-fix-buggy-gnulib.patch | 85 ++++++++++++++++++++
dev-scheme/guile/guile-2.2.7-r2.ebuild | 90 ++++++++++++++++++++++
2 files changed, 175 insertions(+)
diff --git a/dev-scheme/guile/files/guile-2.2.7-fix-buggy-gnulib.patch b/dev-scheme/guile/files/guile-2.2.7-fix-buggy-gnulib.patch
new file mode 100644
index 000000000000..20f04c3b095c
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.2.7-fix-buggy-gnulib.patch
@@ -0,0 +1,85 @@
+From 76d84a62e84d4206d41ffed16b8baa5af2d1e62f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 26 May 2024 13:02:54 -0400
+Subject: [PATCH 1/2] fix invalid bash code causing the wrong type of failure
+
+test $var = no
+
+fails if $var is only ever defined after this line. gnulib is brilliant
+software and naturally does exactly this, because it is highly logical
+to only define code after you try to use it.
+
+Probably. It's hard to tell because the actual code that gets run is:
+
+func_gl_gnulib_m4code_5264294aa0a5557541b53c8c741f7f31
+
+since the other sparkling aspect of gnulib's innovative brilliance is
+the realization that *of course* the most robust way to design software
+is to use checksums as *replacements* for function names.
+
+Or, "that time Eli got jiatanned by gnulib".
+
+The quoting was silently "fixed" upstream in:
+https://github.com/coreutils/gnulib/commit/db1ee11e2168af7137db53289a92e306d2277b0b
+
+It is the same "fix" we do here, thus restoring dash <--> bash
+compatibility and preventing:
+
+```
+ * QA Notice: Abnormal configure code
+ *
+ * ./configure: 38012: test: =: unexpected operator
+```
+
+although it seems to me gnulib is just more generally broken.
+---
+ m4/timegm.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/timegm.m4 b/m4/timegm.m4
+index 510e25a..34e5347 100644
+--- a/m4/timegm.m4
++++ b/m4/timegm.m4
+@@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_TIMEGM],
+ REPLACE_TIMEGM=0
+ AC_CHECK_FUNCS_ONCE([timegm])
+ if test $ac_cv_func_timegm = yes; then
+- if test $gl_cv_func_working_mktime = no; then
++ if test "$gl_cv_func_working_mktime" = no; then
+ # Assume that timegm is buggy if mktime is.
+ REPLACE_TIMEGM=1
+ fi
+--
+2.44.1
+
+
+From fa98775e2a0bc6e33de851a8bd399635b977d0e6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 26 May 2024 13:07:25 -0400
+Subject: [PATCH 2/2] gnulib: backport fix for Modern C in round.m4
+
+https://github.com/coreutils/gnulib/commit/f12a7bbb4acaaa72f48e452e04da2a4dd749a664
+
+Fixes undefined exit() by switching it to merely return. That's the
+upstream fix, so use it although arguably one could simply #include the
+headers for functions that are used...
+---
+ m4/round.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/round.m4 b/m4/round.m4
+index 45b7df4..d4ef7f2 100644
+--- a/m4/round.m4
++++ b/m4/round.m4
+@@ -57,7 +57,7 @@ int main()
+ * (double) (1U << ((DBL_MANT_DIG + 3) / 5))
+ * (double) (1U << ((DBL_MANT_DIG + 4) / 5));
+ volatile double x = 0.5 - 0.5 / TWO_MANT_DIG;
+- exit (x < 0.5 && round (x) != 0.0);
++ return (x < 0.5 && round (x) != 0.0);
+ }]])], [gl_cv_func_round_works=yes], [gl_cv_func_round_works=no],
+ [case "$host_os" in
+ netbsd* | aix*) gl_cv_func_round_works="guessing no";;
+--
+2.44.1
+
diff --git a/dev-scheme/guile/guile-2.2.7-r2.ebuild b/dev-scheme/guile/guile-2.2.7-r2.ebuild
new file mode 100644
index 000000000000..e11937c153c9
--- /dev/null
+++ b/dev-scheme/guile/guile-2.2.7-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MAJOR="2.2"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+ >=dev-libs/boehm-gc-7.0:=[threads?]
+ dev-libs/gmp:=
+ dev-libs/libffi:=
+ dev-libs/libltdl:=
+ dev-libs/libunistring:0=
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ dev-build/libtool
+ sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
+ "${FILESDIR}/${PN}-2.2.7-stack-up.patch"
+ # Modern C bug in round.m4
+ # /bin/sh bug in timegm.m4
+ "${FILESDIR}"/${PN}-2.2.7-fix-buggy-gnulib.patch
+)
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+DOCS=( GUILE-VERSION HACKING README )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # see bug #676468
+ mv prebuilt/32-bit-big-endian{,.broken} || die
+
+ econf \
+ --disable-error-on-warning \
+ --disable-rpath \
+ --disable-static \
+ --enable-posix \
+ --without-libgmp-prefix \
+ --without-libiconv-prefix \
+ --without-libintl-prefix \
+ --without-libltdl-prefix \
+ --without-libreadline-prefix \
+ --without-libunistring-prefix \
+ $(use_enable debug guile-debug) \
+ $(use_enable debug-malloc) \
+ $(use_enable deprecated) \
+ $(use_enable networking) \
+ $(use_enable nls) \
+ $(use_enable regex) \
+ $(use_with threads)
+}
+
+src_install() {
+ default
+
+ # From Novell
+ # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+ dodir /usr/share/gdb/auto-load/$(get_libdir)
+ mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+ # necessary for registering slib, see bug 206896
+ keepdir /usr/share/guile/site
+
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-30 2:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-12 23:24 [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/ Ryan Hill
-- strict thread matches above, loose matches on Subject: below --
2016-07-29 13:17 Amy Winston
2016-11-06 19:13 Amy Winston
2020-10-05 19:04 Sam James
2023-01-04 4:32 Sam James
2024-05-30 2:21 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox