mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 01:16:59 +02:00
sys-devel/m4: Sync with gentoo
It's from gentoo commit 57b682904fc851e1fa9fb1095056544713a76df9.
This commit is contained in:
Krzesimir Nowak
parent
3ba9885fbf
commit
169c28bff9
@ -1,2 +1,2 @@
|
||||
DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389
|
||||
DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
|
||||
DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e487906f1ce47069ea6d3095fd6532aa6b47bcd8109b7cd733fde26915d449a1cfc326f27f5ed83ba29a5a80687b8b9bdb73c8d87e96b8 SHA512 c3e7d4c1631e401c6b5477c22fd5de837188acf9d72551b116c665a927d1799b1fb249e90c9fb4f6f2f328ee84b2e4dd0bf54f684139997c19ee5b69a3e9284d
|
||||
DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
|
||||
|
||||
@ -1,111 +0,0 @@
|
||||
This fixes the search for posix_spawn() to use AC_SEARCH_LIBS which
|
||||
is needed for uClibc which puts the function in librt [1]. The fix
|
||||
is in gnulib commit d6eab2e [2], but we can't just apply that patch
|
||||
and autoreconf because that means we must depend on autotools.eclass
|
||||
and this leads to a circular dependency. So we have to patch
|
||||
configure directlly.
|
||||
|
||||
[1] https://bugs.gentoo.org/show_bug.cgi?id=580688
|
||||
[2] http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d6eab2e70fc5ccc82a73e5c988b76a229e4cd3d5
|
||||
[3] https://bugs.gentoo.org/show_bug.cgi?id=581086
|
||||
|
||||
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
|
||||
|
||||
diff -Naur m4-1.4.17.orig/configure m4-1.4.17/configure
|
||||
--- m4-1.4.17.orig/configure 2013-09-22 06:38:28.000000000 +0000
|
||||
+++ m4-1.4.17/configure 2016-04-25 22:27:12.774118561 +0000
|
||||
@@ -808,6 +808,7 @@
|
||||
GNULIB_SIGNAL_H_SIGPIPE
|
||||
GNULIB_RAISE
|
||||
GNULIB_PTHREAD_SIGMASK
|
||||
+LIB_POSIX_SPAWN
|
||||
REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
|
||||
REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
|
||||
REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
|
||||
@@ -3590,7 +3591,6 @@
|
||||
as_fn_append ac_func_list " mkstemp"
|
||||
as_fn_append ac_func_list " nl_langinfo"
|
||||
as_fn_append ac_func_list " pipe2"
|
||||
-as_fn_append ac_func_list " posix_spawn"
|
||||
gl_printf_safe=yes
|
||||
as_fn_append ac_func_list " isblank"
|
||||
as_fn_append ac_func_list " iswctype"
|
||||
@@ -15877,8 +15881,78 @@
|
||||
|
||||
|
||||
|
||||
+ LIB_POSIX_SPAWN=
|
||||
+
|
||||
+ gl_saved_libs=$LIBS
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5
|
||||
+$as_echo_n "checking for library containing posix_spawn... " >&6; }
|
||||
+if ${ac_cv_search_posix_spawn+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ ac_func_search_save_LIBS=$LIBS
|
||||
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
+/* end confdefs.h. */
|
||||
+
|
||||
+/* Override any GCC internal prototype to avoid an error.
|
||||
+ Use char because int might match the return type of a GCC
|
||||
+ builtin and then its argument prototype would still apply. */
|
||||
+#ifdef __cplusplus
|
||||
+extern "C"
|
||||
+#endif
|
||||
+char posix_spawn ();
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+return posix_spawn ();
|
||||
+ ;
|
||||
+ return 0;
|
||||
+}
|
||||
+_ACEOF
|
||||
+for ac_lib in '' rt; do
|
||||
+ if test -z "$ac_lib"; then
|
||||
+ ac_res="none required"
|
||||
+ else
|
||||
+ ac_res=-l$ac_lib
|
||||
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||
+ fi
|
||||
+ if ac_fn_c_try_link "$LINENO"; then :
|
||||
+ ac_cv_search_posix_spawn=$ac_res
|
||||
+fi
|
||||
+rm -f core conftest.err conftest.$ac_objext \
|
||||
+ conftest$ac_exeext
|
||||
+ if ${ac_cv_search_posix_spawn+:} false; then :
|
||||
+ break
|
||||
+fi
|
||||
+done
|
||||
+if ${ac_cv_search_posix_spawn+:} false; then :
|
||||
+
|
||||
+else
|
||||
+ ac_cv_search_posix_spawn=no
|
||||
+fi
|
||||
+rm conftest.$ac_ext
|
||||
+LIBS=$ac_func_search_save_LIBS
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5
|
||||
+$as_echo "$ac_cv_search_posix_spawn" >&6; }
|
||||
+ac_res=$ac_cv_search_posix_spawn
|
||||
+if test "$ac_res" != no; then :
|
||||
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||||
+ test "$ac_cv_search_posix_spawn" = "none required" ||
|
||||
+ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn
|
||||
+fi
|
||||
+
|
||||
+ for ac_func in posix_spawn
|
||||
+do :
|
||||
+ ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
|
||||
+if test "x$ac_cv_func_posix_spawn" = xyes; then :
|
||||
+ cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_POSIX_SPAWN 1
|
||||
+_ACEOF
|
||||
|
||||
+fi
|
||||
+done
|
||||
|
||||
+ LIBS=$gl_saved_libs
|
||||
|
||||
if test $ac_cv_func_posix_spawn != yes; then
|
||||
HAVE_POSIX_SPAWN=0
|
||||
@ -1,30 +0,0 @@
|
||||
http://lists.gnu.org/archive/html/bug-gnulib/2017-07/txtmumXtpD69v.txt
|
||||
|
||||
extract of only the relevant hunk to avoid irrelevant conflicts
|
||||
|
||||
From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <address@hidden>
|
||||
Date: Fri, 7 Jul 2017 14:10:20 -0700
|
||||
Subject: [PATCH] vasnprintf: port to macOS 10.13
|
||||
|
||||
Problem reported by comex in:
|
||||
http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html
|
||||
* lib/vasnprintf.c (VASNPRINTF): Donât use %n on macOS.
|
||||
|
||||
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
|
||||
index 9c2af0e..fecaf27 100644
|
||||
--- a/lib/vasnprintf.c
|
||||
+++ b/lib/vasnprintf.c
|
||||
@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
|
||||
#endif
|
||||
*fbp = dp->conversion;
|
||||
#if USE_SNPRINTF
|
||||
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
|
||||
+# if ! (((__GLIBC__ > 2 \
|
||||
+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
|
||||
+ && !defined __UCLIBC__) \
|
||||
+ || (defined __APPLE__ && defined __MACH__) \
|
||||
+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
|
||||
fbp[1] = '%';
|
||||
fbp[2] = 'n';
|
||||
fbp[3] = '\0';
|
||||
@ -1,310 +0,0 @@
|
||||
Fix build failure on glibc-2.28:
|
||||
fseeko.c: In function 'rpl_fseeko':
|
||||
fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
|
||||
#error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
|
||||
|
||||
Patch by milan hodoscek.
|
||||
|
||||
https://bugs.gentoo.org/663924
|
||||
--- a/old/stdio-impl.h
|
||||
+++ b/lib/stdio-impl.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Implementation details of FILE streams.
|
||||
- Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -12,12 +12,18 @@
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Many stdio implementations have the same logic and therefore can share
|
||||
the same implementation of stdio extension API, except that some fields
|
||||
have different naming conventions, or their access requires some casts. */
|
||||
|
||||
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
|
||||
+ problem by defining it ourselves. FIXME: Do not rely on glibc
|
||||
+ internals. */
|
||||
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
|
||||
+# define _IO_IN_BACKUP 0x100
|
||||
+#endif
|
||||
|
||||
/* BSD stdio derived implementations. */
|
||||
|
||||
@@ -29,10 +35,10 @@
|
||||
#include <errno.h> /* For detecting Plan9. */
|
||||
|
||||
#if defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
||||
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
|
||||
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
||||
|
||||
# if defined __DragonFly__ /* DragonFly */
|
||||
- /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>. */
|
||||
+ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h>. */
|
||||
# define fp_ ((struct { struct __FILE_public pub; \
|
||||
struct { unsigned char *_base; int _size; } _bf; \
|
||||
void *cookie; \
|
||||
@@ -49,30 +55,84 @@
|
||||
fpos_t _offset; \
|
||||
/* More fields, not relevant here. */ \
|
||||
} *) fp)
|
||||
- /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>. */
|
||||
+ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h>. */
|
||||
# define _p pub._p
|
||||
# define _flags pub._flags
|
||||
# define _r pub._r
|
||||
# define _w pub._w
|
||||
+# elif defined __ANDROID__ /* Android */
|
||||
+ /* Up to this commit from 2015-10-12
|
||||
+ <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
|
||||
+ the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
|
||||
+ see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
|
||||
+ and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
|
||||
+ After this commit, the innards of FILE are hidden. */
|
||||
+# define fp_ ((struct { unsigned char *_p; \
|
||||
+ int _r; \
|
||||
+ int _w; \
|
||||
+ int _flags; \
|
||||
+ int _file; \
|
||||
+ struct { unsigned char *_base; size_t _size; } _bf; \
|
||||
+ int _lbfsize; \
|
||||
+ void *_cookie; \
|
||||
+ void *_close; \
|
||||
+ void *_read; \
|
||||
+ void *_seek; \
|
||||
+ void *_write; \
|
||||
+ struct { unsigned char *_base; size_t _size; } _ext; \
|
||||
+ unsigned char *_up; \
|
||||
+ int _ur; \
|
||||
+ unsigned char _ubuf[3]; \
|
||||
+ unsigned char _nbuf[1]; \
|
||||
+ struct { unsigned char *_base; size_t _size; } _lb; \
|
||||
+ int _blksize; \
|
||||
+ fpos_t _offset; \
|
||||
+ /* More fields, not relevant here. */ \
|
||||
+ } *) fp)
|
||||
# else
|
||||
# define fp_ fp
|
||||
# endif
|
||||
|
||||
-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
|
||||
+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
|
||||
/* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
|
||||
- and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
|
||||
+ and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
|
||||
+ and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
|
||||
struct __sfileext
|
||||
{
|
||||
struct __sbuf _ub; /* ungetc buffer */
|
||||
/* More fields, not relevant here. */
|
||||
};
|
||||
# define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
|
||||
-# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */
|
||||
+# elif defined __ANDROID__ /* Android */
|
||||
+ struct __sfileext
|
||||
+ {
|
||||
+ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
|
||||
+ /* More fields, not relevant here. */
|
||||
+ };
|
||||
+# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
|
||||
+# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
|
||||
# define fp_ub fp_->_ub
|
||||
# endif
|
||||
|
||||
# define HASUB(fp) (fp_ub._base != NULL)
|
||||
|
||||
+# if defined __ANDROID__ /* Android */
|
||||
+ /* Needed after this commit from 2016-01-25
|
||||
+ <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
|
||||
+# ifndef __SEOF
|
||||
+# define __SLBF 1
|
||||
+# define __SNBF 2
|
||||
+# define __SRD 4
|
||||
+# define __SWR 8
|
||||
+# define __SRW 0x10
|
||||
+# define __SEOF 0x20
|
||||
+# define __SERR 0x40
|
||||
+# endif
|
||||
+# ifndef __SOFF
|
||||
+# define __SOFF 0x1000
|
||||
+# endif
|
||||
+# endif
|
||||
+
|
||||
#endif
|
||||
|
||||
|
||||
@@ -81,7 +141,7 @@
|
||||
#ifdef __TANDEM /* NonStop Kernel */
|
||||
# ifndef _IOERR
|
||||
/* These values were determined by the program 'stdioext-flags' at
|
||||
- <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */
|
||||
+ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
|
||||
# define _IOERR 0x40
|
||||
# define _IOREAD 0x80
|
||||
# define _IOWRT 0x4
|
||||
@@ -99,6 +159,8 @@
|
||||
int _file; \
|
||||
unsigned int _flag; \
|
||||
} *) fp)
|
||||
+# elif defined __VMS /* OpenVMS */
|
||||
+# define fp_ ((struct _iobuf *) fp)
|
||||
# else
|
||||
# define fp_ fp
|
||||
# endif
|
||||
@@ -110,7 +172,7 @@
|
||||
# define _flag __flag
|
||||
# endif
|
||||
|
||||
-#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* newer Windows with MSVC */
|
||||
+#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */
|
||||
|
||||
/* <stdio.h> does not define the innards of FILE any more. */
|
||||
# define WINDOWS_OPAQUE_FILE
|
||||
@@ -130,7 +192,7 @@ struct _gl_real_FILE
|
||||
# define fp_ ((struct _gl_real_FILE *) fp)
|
||||
|
||||
/* These values were determined by a program similar to the one at
|
||||
- <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */
|
||||
+ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
|
||||
# define _IOREAD 0x1
|
||||
# define _IOWRT 0x2
|
||||
# define _IORW 0x4
|
||||
--- a/old/fseeko.c
|
||||
+++ b/lib/fseeko.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/* An fseeko() function that, together with fflush(), is POSIX compliant.
|
||||
- Copyright (C) 2007-2016 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 2007-2018 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -12,7 +12,7 @@
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
- with this program; if not, see <http://www.gnu.org/licenses/>. */
|
||||
+ with this program; if not, see <https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence)
|
||||
#endif
|
||||
#if _GL_WINDOWS_64_BIT_OFF_T
|
||||
# undef fseeko
|
||||
-# if HAVE__FSEEKI64 /* msvc, mingw64 */
|
||||
+# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
|
||||
# define fseeko _fseeki64
|
||||
-# else /* mingw */
|
||||
+# else /* mingw before msvcrt8.0 */
|
||||
# define fseeko fseeko64
|
||||
# endif
|
||||
#endif
|
||||
@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence)
|
||||
#endif
|
||||
|
||||
/* These tests are based on fpurge.c. */
|
||||
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
|
||||
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
if (fp->_IO_read_end == fp->_IO_read_ptr
|
||||
&& fp->_IO_write_ptr == fp->_IO_write_base
|
||||
&& fp->_IO_save_base == NULL)
|
||||
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
||||
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
|
||||
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
||||
# if defined __SL64 && defined __SCLE /* Cygwin */
|
||||
if ((fp->_flags & __SL64) == 0)
|
||||
{
|
||||
@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence)
|
||||
#elif defined __minix /* Minix */
|
||||
if (fp_->_ptr == fp_->_buf
|
||||
&& (fp_->_ptr == NULL || fp_->_count == 0))
|
||||
-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
|
||||
+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
|
||||
if (fp_->_ptr == fp_->_base
|
||||
&& (fp_->_ptr == NULL || fp_->_cnt == 0))
|
||||
#elif defined __UCLIBC__ /* uClibc */
|
||||
@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence)
|
||||
if (pos == -1)
|
||||
{
|
||||
#if defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
||||
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
|
||||
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
||||
fp_->_flags &= ~__SOFF;
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
|
||||
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
|
||||
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
fp->_flags &= ~_IO_EOF_SEEN;
|
||||
fp->_offset = pos;
|
||||
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
||||
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
|
||||
-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
|
||||
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
||||
+# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix
|
||||
/* fp_->_offset is typed as an integer. */
|
||||
fp_->_offset = pos;
|
||||
# else
|
||||
@@ -150,7 +152,7 @@ fseeko (FILE *fp, off_t offset, int whence)
|
||||
fp_->_flags &= ~__SEOF;
|
||||
#elif defined __EMX__ /* emx+gcc */
|
||||
fp->_flags &= ~_IOEOF;
|
||||
-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
|
||||
+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
|
||||
fp_->_flag &= ~_IOEOF;
|
||||
#elif defined __MINT__ /* Atari FreeMiNT */
|
||||
fp->__offset = pos;
|
||||
--- a/old/freadahead.c
|
||||
+++ b/lib/freadahead.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Retrieve information about a FILE stream.
|
||||
- Copyright (C) 2007-2016 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 2007-2018 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -12,7 +12,7 @@
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
@@ -22,17 +22,26 @@
|
||||
#include <stdlib.h>
|
||||
#include "stdio-impl.h"
|
||||
|
||||
+#if defined __DragonFly__
|
||||
+/* Defined in libc, but not declared in <stdio.h>. */
|
||||
+extern size_t __sreadahead (FILE *);
|
||||
+#endif
|
||||
+
|
||||
+/* This file is not used on systems that have the __freadahead function,
|
||||
+ namely musl libc. */
|
||||
+
|
||||
size_t
|
||||
freadahead (FILE *fp)
|
||||
{
|
||||
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
|
||||
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
|
||||
if (fp->_IO_write_ptr > fp->_IO_write_base)
|
||||
return 0;
|
||||
return (fp->_IO_read_end - fp->_IO_read_ptr)
|
||||
+ (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base :
|
||||
0);
|
||||
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
||||
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
|
||||
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
||||
if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
|
||||
return 0;
|
||||
# if defined __DragonFly__
|
||||
18
sdk_container/src/third_party/portage-stable/sys-devel/m4/files/ppc-musl.patch
vendored
Normal file
18
sdk_container/src/third_party/portage-stable/sys-devel/m4/files/ppc-musl.patch
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
Needed to fix build on ppc + musl. Doesn't seem to yet be in upstream gnulib.
|
||||
|
||||
https://www.openwall.com/lists/musl/2017/11/05/2
|
||||
https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch
|
||||
--- a/lib/sigsegv.c
|
||||
+++ b/lib/sigsegv.c
|
||||
@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
|
||||
/* both should be equivalent */
|
||||
# if 0
|
||||
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
|
||||
-# else
|
||||
+# elif defined(__GLIBC__)
|
||||
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
|
||||
+# else
|
||||
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
|
||||
# endif
|
||||
# endif
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="GNU macro processor"
|
||||
HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
|
||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="examples"
|
||||
|
||||
# remember: cannot dep on autoconf since it needs us
|
||||
DEPEND="app-arch/xz-utils"
|
||||
RDEPEND=""
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-posix_spawn.patch #580688, 581086
|
||||
|
||||
# Disable gnulib build test that has no impact on the source.
|
||||
# Re-enable w/next version bump (and gnulib is updated). #554728
|
||||
[[ ${PV} != "1.4.17" ]] && die "re-enable test #554728"
|
||||
echo 'exit 0' > tests/test-update-copyright.sh || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Disable automagic dependency over libsigsegv; see bug #278026
|
||||
export ac_cv_libsigsegv=no
|
||||
|
||||
local myconf=""
|
||||
[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
|
||||
econf --enable-changeword ${myconf}
|
||||
}
|
||||
|
||||
src_test() {
|
||||
[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
# autoconf-2.60 for instance, first checks gm4, then m4. If we don't have
|
||||
# gm4, it might find gm4 from outside the prefix on for instance Darwin
|
||||
use prefix && dosym /usr/bin/m4 /usr/bin/gm4
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
dodoc examples/*
|
||||
rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
|
||||
fi
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
DESCRIPTION="GNU macro processor"
|
||||
HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
|
||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="examples"
|
||||
|
||||
# remember: cannot dep on autoconf since it needs us
|
||||
DEPEND="app-arch/xz-utils"
|
||||
RDEPEND=""
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}"/${P}-darwin17-printf-n.patch
|
||||
eapply "${FILESDIR}"/${P}-glibc228.patch #663924
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Disable automagic dependency over libsigsegv; see bug #278026
|
||||
export ac_cv_libsigsegv=no
|
||||
|
||||
local myconf=""
|
||||
[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
|
||||
econf --enable-changeword ${myconf}
|
||||
}
|
||||
|
||||
src_test() {
|
||||
[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
# autoconf-2.60 for instance, first checks gm4, then m4. If we don't have
|
||||
# gm4, it might find gm4 from outside the prefix on for instance Darwin
|
||||
use prefix && dosym /usr/bin/m4 /usr/bin/gm4
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
dodoc -r examples/
|
||||
rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
|
||||
fi
|
||||
}
|
||||
74
sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19.ebuild
vendored
Normal file
74
sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19.ebuild
vendored
Normal file
@ -0,0 +1,74 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="GNU macro processor"
|
||||
HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
|
||||
if [[ "${PV}" == *_beta* ]] ; then
|
||||
MY_P="${PN}-1.4.18d"
|
||||
#SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
|
||||
SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
else
|
||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
|
||||
SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE="examples nls"
|
||||
|
||||
RDEPEND="
|
||||
virtual/libiconv
|
||||
nls? (
|
||||
sys-devel/gettext
|
||||
virtual/libintl
|
||||
)"
|
||||
DEPEND="${RDEPEND}"
|
||||
# Remember: cannot dep on autoconf since it needs us
|
||||
BDEPEND="app-arch/xz-utils
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/ppc-musl.patch
|
||||
"${WORKDIR}"/${P}-test-198-sysval-r1.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local -a myeconfargs=(
|
||||
--enable-changeword
|
||||
|
||||
--with-packager="Gentoo Linux"
|
||||
--with-packager-version="${PVR}"
|
||||
--with-packager-bug-reports="https://bugs.gentoo.org/"
|
||||
|
||||
$(usex nls '' '--disable-nls')
|
||||
|
||||
# Disable automagic dependency over libsigsegv; see bug #278026
|
||||
ac_cv_libsigsegv=no
|
||||
)
|
||||
|
||||
[[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g )
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# autoconf-2.60 for instance, first checks gm4, then m4. If we don't have
|
||||
# gm4, it might find gm4 from outside the prefix on for instance Darwin
|
||||
use prefix && dosym m4 /usr/bin/gm4
|
||||
|
||||
if use examples ; then
|
||||
dodoc -r examples
|
||||
rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
|
||||
fi
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user