commit: c66bf9a358aad067beef91f5adf2187338e32e98 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Mon Oct 21 11:52:03 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Mon Oct 21 11:54:41 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c66bf9a3
remove masked v1.8.8 Closes: https://github.com/gentoo/musl/pull/273 Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com> Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> dev-scheme/guile/Manifest | 1 - dev-scheme/guile/files/50guile-gentoo.el | 1 - .../guile/files/guile-1.8.8-fix-defines.patch | 24 ----- .../guile/files/guile-1.8.8-fix_guile-config.patch | 14 --- dev-scheme/guile/files/guile-1.8.8-gcc46.patch | 39 ------- dev-scheme/guile/files/guile-1.8.8-gcc5.patch | 15 --- .../guile/files/guile-1.8.8-gtexinfo-5.patch | 15 --- .../guile/files/guile-1.8.8-makeinfo-5.patch | 71 ------------ .../guile/files/guile-1.8.8-mkdir-mask.patch | 35 ------ dev-scheme/guile/files/guile-1.8.8-readline.patch | 34 ------ dev-scheme/guile/files/guile-1.8.8-sandbox.patch | 15 --- dev-scheme/guile/files/guile-1.8.8-tinfo.patch | 15 --- dev-scheme/guile/guile-1.8.8-r3.ebuild | 120 --------------------- dev-scheme/guile/metadata.xml | 21 ---- 14 files changed, 420 deletions(-) diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest deleted file mode 100644 index a04fe8e..0000000 --- a/dev-scheme/guile/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST guile-1.8.8.tar.gz 3956654 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 WHIRLPOOL 104810030b5dae16805595a5b398e5a7e600771b64b08d5ff686036e2f273dcec3829a16e4cdb1dbb9db5813f2e225476f83e0535a789bc570fc2fc15a76dbe2 diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el deleted file mode 100644 index 431f7e9..0000000 --- a/dev-scheme/guile/files/50guile-gentoo.el +++ /dev/null @@ -1 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") diff --git a/dev-scheme/guile/files/guile-1.8.8-fix-defines.patch b/dev-scheme/guile/files/guile-1.8.8-fix-defines.patch deleted file mode 100644 index 341354d..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-fix-defines.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- guile-1.8.8.orig/libguile/fports.c -+++ guile-1.8.8/libguile/fports.c -@@ -78,8 +78,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 ---- guile-1.8.8.orig/libguile/gc_os_dep.c -+++ guile-1.8.8/libguile/gc_os_dep.c -@@ -1459,7 +1459,7 @@ - # undef __KERNEL__ - # endif - --# else -+# elif defined(__GLIBC__) - - /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ - /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch b/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch deleted file mode 100644 index 2b04426..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN 1/configure.in 2/configure.in ---- 1/configure.in 2010-12-13 17:24:39.000000000 +0000 -+++ 2/configure.in 2011-04-29 11:53:39.000000000 +0000 -@@ -1522,8 +1522,8 @@ - ####################################################################### - - dnl Tell guile-config what flags guile users should compile and link with. --GUILE_LIBS="$LDFLAGS $LIBS" --GUILE_CFLAGS="$CPPFLAGS $PTHREAD_CFLAGS" -+GUILE_LIBS="$LIBS" -+GUILE_CFLAGS="$PTHREAD_CFLAGS" - AC_SUBST(GUILE_LIBS) - AC_SUBST(GUILE_CFLAGS) - diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc46.patch b/dev-scheme/guile/files/guile-1.8.8-gcc46.patch deleted file mode 100644 index b06a0e5..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-gcc46.patch +++ /dev/null @@ -1,39 +0,0 @@ -Backported upstream patch to fix SIGSEGV with gcc-4.6 - -http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94 -https://bugs.gentoo.org/show_bug.cgi?id=424475 ---- a/configure.in -+++ b/configure.in -@@ -1199,23 +1199,20 @@ - AC_RUN_IFELSE([AC_LANG_SOURCE( - [AC_INCLUDES_DEFAULT - int --find_stack_direction () -+find_stack_direction (int *addr, int depth) - { -- static char *addr = 0; -- auto char dummy; -- if (addr == 0) -- { -- addr = &dummy; -- return find_stack_direction (); -- } -- else -- return (&dummy > addr) ? 1 : -1; -+ int dir, dummy = 0; -+ if (! addr) -+ addr = &dummy; -+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; -+ dir = depth ? find_stack_direction (addr, depth - 1) : 0; -+ return dir + dummy; - } - - int --main () -+main (int argc, char **argv) - { -- return find_stack_direction () < 0; -+ return find_stack_direction (0, argc + !argv + 20) < 0; - }])], - [SCM_I_GSC_STACK_GROWS_UP=1], - [], diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc5.patch b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch deleted file mode 100644 index 742ea0b..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-gcc5.patch +++ /dev/null @@ -1,15 +0,0 @@ -Preprocessor changes in GCC 5 cause guile-snarf to output garbage. - -https://bugs.gentoo.org/560736 - ---- a/libguile/guile-snarf.in -+++ b/libguile/guile-snarf.in -@@ -50,7 +50,7 @@ - ## Apparently, AIX's preprocessor is unhappy if you try to #include an - ## empty file. - echo "/* cpp arguments: $@ */" ; -- ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true -+ ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true - grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/" - } - diff --git a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch deleted file mode 100644 index d7fbda1..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-gtexinfo-5.patch +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-doc_tutorial_guile-tut.texi,v 1.1 2013/11/30 07:06:25 dsainty Exp $ - -Compatibility with gtexinfo 5.2 - ---- doc/tutorial/guile-tut.texi 2010-12-14 06:24:39.000000000 +1300 -+++ doc/tutorial/guile-tut.texi 2013-11-30 19:44:28.304575529 +1300 -@@ -446,7 +446,7 @@ - Schemer} from that list.} - - --@subsection Hello World -+@section Hello World - @cindex hello world - - Our first program is the typical Scheme "hello world" program. Put the \ No newline at end of file diff --git a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch deleted file mode 100644 index 9f3a02c..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 937da0f2604ea208ec56517c5a41e582f316a246 Mon Sep 17 00:00:00 2001 -From: Cyprien Nicolas <c...@fulax.fr> -Date: Thu, 18 Apr 2013 23:45:23 +0200 -Subject: [PATCH] Fix texinfo files for makeinfo-5.1 - ---- - doc/ref/api-options.texi | 2 +- - doc/ref/api-utility.texi | 2 +- - doc/ref/fdl.texi | 2 +- - doc/ref/gh.texi | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/doc/ref/api-options.texi b/doc/ref/api-options.texi -index 7b7a6e0..6ce7291 100644 ---- a/doc/ref/api-options.texi -+++ b/doc/ref/api-options.texi -@@ -377,9 +377,9 @@ configure @emph{reading}, @emph{printing}, @emph{debugging} or - * User level options interfaces:: - * Reader options:: - * Printing options:: --* Debugger options:: - * Evaluator options:: - * Evaluator trap options:: -+* Debugger options:: - * Examples of option use:: - @end menu - -diff --git a/doc/ref/api-utility.texi b/doc/ref/api-utility.texi -index 4a90212..9a4f3cc 100644 ---- a/doc/ref/api-utility.texi -+++ b/doc/ref/api-utility.texi -@@ -657,7 +657,7 @@ Return 1 if @var{x} is a Scheme-level hook, 0 otherwise. - @end deftypefn - - --@subsubsection Handling Scheme-level hooks from C code -+@subsubheading Handling Scheme-level hooks from C code - - Here is an example of how to handle Scheme-level hooks from C code using - the above functions. -diff --git a/doc/ref/fdl.texi b/doc/ref/fdl.texi -index 17fe148..4866055 100644 ---- a/doc/ref/fdl.texi -+++ b/doc/ref/fdl.texi -@@ -408,7 +408,7 @@ as a draft) by the Free Software Foundation. - @end enumerate - - @page --@appendixsubsec ADDENDUM: How to use this License for your documents -+@appendixsec ADDENDUM: How to use this License for your documents - - To use this License in a document you have written, include a copy of - the License in the document and put the following copyright and -diff --git a/doc/ref/gh.texi b/doc/ref/gh.texi -index 95dfd92..bbd3af1 100644 ---- a/doc/ref/gh.texi -+++ b/doc/ref/gh.texi -@@ -995,8 +995,8 @@ These correspond to the Scheme @code{(cons a b)} and @code{(list l0 l1 - - @deftypefun SCM gh_car (SCM @var{obj}) - @deftypefunx SCM gh_cdr (SCM @var{obj}) --@dots{} -- -+@deftypefunx SCM gh_c[ad][ad]r (SCM @var{obj}) -+@deftypefunx SCM gh_c[ad][ad][ad]r (SCM @var{obj}) - @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj}) - These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{} - @end deftypefun --- -1.8.2.1 - 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 deleted file mode 100644 index 7d1c703..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-mkdir-mask.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch deleted file mode 100644 index 68f64c5..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-readline.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/files/guile-1.8.8-sandbox.patch b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch deleted file mode 100644 index 70d752f..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-sandbox.patch +++ /dev/null @@ -1,15 +0,0 @@ -Prevent sandbox violation when installing - -https://bugs.gentoo.org/521546 - ---- a/guile-config/Makefile.am -+++ b/guile-config/Makefile.am -@@ -39,8 +39,3 @@ guile-config: guile-config.in ${top_builddir}/libguile/libpath.h - -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: - chmod +x guile-config.tmp - mv guile-config.tmp guile-config -- --## Get rid of any copies of the configuration script under the old --## name, so people don't end up running ancient copies of it. --install-exec-local: -- rm -f ${bindir}/build-guile diff --git a/dev-scheme/guile/files/guile-1.8.8-tinfo.patch b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch deleted file mode 100644 index 6c4d011..0000000 --- a/dev-scheme/guile/files/guile-1.8.8-tinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ -With ncurses[tinfo] tgoto will be in libtinfo - -https://bugs.gentoo.org/539316 - ---- a/guile-readline/configure.in -+++ b/guile-readline/configure.in -@@ -33,7 +33,7 @@ if test "$MINGW32" = "yes" ; then - fi - AC_SUBST(EXTRA_DEFS) - --for termlib in ncurses curses termcap terminfo termlib ; do -+for termlib in ncurses curses termcap terminfo termlib tinfo ; do - AC_CHECK_LIB(${termlib}, tgoto, - [LIBS="-l${termlib} $LIBS"; break]) - done diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild deleted file mode 100644 index 80a8753..0000000 --- a/dev-scheme/guile/guile-1.8.8-r3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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="amd64 arm arm64 ~mips ppc x86" -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" - - epatch "${FILESDIR}/${P}-fix-defines.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() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml deleted file mode 100644 index 02c7884..0000000 --- a/dev-scheme/guile/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>sch...@gentoo.org</email> - <name>Gentoo Scheme Project</name> - </maintainer> - <longdescription lang="en"> -Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs. - </longdescription> - <use> - <flag name="debug-freelist">Include garbage collector freelist debugging - code</flag> - <flag name="debug-malloc">Include malloc debugging code</flag> - <flag name="deprecated">Enable deprecated features</flag> - <flag name="discouraged"> (implied by deprecated) enable merely discouraged - features</flag> - <flag name="networking">Include networking interfaces</flag> - <flag name="regex"> Include regular expression interfaces</flag> - </use> -</pkgmetadata>
