tools: m4: fix compilation with glibc 2.28
Add a temporary workaround to compile with glibc 2.28 as some constants were removed and others made private Signed-off-by: Luis Araneda <luaraneda@gmail.com>
This commit is contained in:
		 Luis Araneda
					Luis Araneda
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							67f91dfa51
						
					
				
				
					commit
					c448f79840
				
			
							
								
								
									
										118
									
								
								tools/m4/patches/010-glibc-change-work-around.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										118
									
								
								tools/m4/patches/010-glibc-change-work-around.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,118 @@ | |||||||
|  | Subject: Workaround change in glibc | ||||||
|  |  | ||||||
|  | Temporary workaround to compile with glibc 2.28, which | ||||||
|  | deprecated some constants | ||||||
|  |  | ||||||
|  | Taken from the rpms/m4 Fedora repository, commit 814d5921 | ||||||
|  | (Work around change in glibc) | ||||||
|  |  | ||||||
|  | Original filename: m4-1.4.18-glibc-change-work-around.patch | ||||||
|  |  | ||||||
|  | --- a/lib/stdio-impl.h | ||||||
|  | +++ b/lib/stdio-impl.h | ||||||
|  | @@ -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.  */ | ||||||
|  |   | ||||||
|  | --- a/lib/fflush.c | ||||||
|  | +++ b/lib/fflush.c | ||||||
|  | @@ -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); | ||||||
|  |   | ||||||
|  | --- a/lib/fpending.c | ||||||
|  | +++ b/lib/fpending.c | ||||||
|  | @@ -32,7 +32,7 @@ __fpending (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->_IO_write_ptr - fp->_IO_write_base; | ||||||
|  |  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ | ||||||
|  |    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ | ||||||
|  | --- a/lib/fpurge.c | ||||||
|  | +++ b/lib/fpurge.c | ||||||
|  | @@ -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.  */ | ||||||
|  | --- a/lib/freadahead.c | ||||||
|  | +++ b/lib/freadahead.c | ||||||
|  | @@ -25,7 +25,7 @@ | ||||||
|  |  size_t | ||||||
|  |  freadahead (FILE *fp) | ||||||
|  |  { | ||||||
|  | -#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_write_ptr > fp->_IO_write_base) | ||||||
|  |      return 0; | ||||||
|  |    return (fp->_IO_read_end - fp->_IO_read_ptr) | ||||||
|  | --- a/lib/freading.c | ||||||
|  | +++ b/lib/freading.c | ||||||
|  | @@ -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)); | ||||||
|  | --- a/lib/fseeko.c | ||||||
|  | +++ b/lib/fseeko.c | ||||||
|  | @@ -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__ | ||||||
		Reference in New Issue
	
	Block a user