Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 558462 Details for
Bug 672048
app-arch/sharutils-4.15.2 - 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."
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gnulib_vs_recent_glibc_workaround.patch
gnulib_libio_sharutils_blahblahblah.patch (text/plain), 4.70 KB, created by
Greg Turner
on 2018-12-25 04:20:57 UTC
(
hide
)
Description:
gnulib_vs_recent_glibc_workaround.patch
Filename:
MIME Type:
Creator:
Greg Turner
Created:
2018-12-25 04:20:57 UTC
Size:
4.70 KB
patch
obsolete
>analagous to https://lists.gnu.org/r/bug-gnulib/2018-03/txtTc1bTw2mGz.txt; >see ie https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=915173 > >gmt > >-- > >diff -urpN sharutils-4.15.2.orig/lib/fflush.c sharutils-4.15.2/lib/fflush.c >--- sharutils-4.15.2.orig/lib/fflush.c 2015-05-30 08:34:54.000000000 -0700 >+++ sharutils-4.15.2/lib/fflush.c 2018-12-24 19:51:59.126008314 -0800 >@@ -33,7 +33,7 @@ > #undef fflush > > >-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ >+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ > > /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ > static void >@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) > > #endif > >-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) >+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) > > # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT > /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ >@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) > if (stream == NULL || ! freading (stream)) > return fflush (stream); > >-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ >+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ > > clear_ungetc_buffer_preserving_position (stream); > >diff -urpN sharutils-4.15.2.orig/lib/fpurge.c sharutils-4.15.2/lib/fpurge.c >--- sharutils-4.15.2.orig/lib/fpurge.c 2015-05-30 08:34:54.000000000 -0700 >+++ sharutils-4.15.2/lib/fpurge.c 2018-12-24 19:51:59.126008314 -0800 >@@ -62,7 +62,7 @@ fpurge (FILE *fp) > /* Most systems provide FILE as a struct and the necessary bitmask in > <stdio.h>, because they need it for implementing getc() and putc() as > fast macros. */ >-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ >+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ > fp->_IO_read_end = fp->_IO_read_ptr; > fp->_IO_write_ptr = fp->_IO_write_base; > /* Avoid memory leak when there is an active ungetc buffer. */ >diff -urpN sharutils-4.15.2.orig/lib/freading.c sharutils-4.15.2/lib/freading.c >--- sharutils-4.15.2.orig/lib/freading.c 2015-05-30 08:34:54.000000000 -0700 >+++ sharutils-4.15.2/lib/freading.c 2018-12-24 19:51:59.126008314 -0800 >@@ -31,7 +31,7 @@ freading (FILE *fp) > /* Most systems provide FILE as a struct and the necessary bitmask in > <stdio.h>, because they need it for implementing getc() and putc() as > fast macros. */ >-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ >+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ > return ((fp->_flags & _IO_NO_WRITES) != 0 > || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 > && fp->_IO_read_base != NULL)); >diff -urpN sharutils-4.15.2.orig/lib/fseeko.c sharutils-4.15.2/lib/fseeko.c >--- sharutils-4.15.2.orig/lib/fseeko.c 2015-05-30 08:34:54.000000000 -0700 >+++ sharutils-4.15.2/lib/fseeko.c 2018-12-24 19:51:59.126008314 -0800 >@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when > #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 || __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) >@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when > return -1; > } > >-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ >+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ > fp->_flags &= ~_IO_EOF_SEEN; > fp->_offset = pos; > #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ >diff -urpN sharutils-4.15.2.orig/lib/stdio-impl.h sharutils-4.15.2/lib/stdio-impl.h >--- sharutils-4.15.2.orig/lib/stdio-impl.h 2015-05-30 08:34:57.000000000 -0700 >+++ sharutils-4.15.2/lib/stdio-impl.h 2018-12-24 19:51:59.126008314 -0800 >@@ -18,6 +18,12 @@ > 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. */ >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 672048
:
556444
|
556446
| 558462