bug-make
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

No follow up on patches to support newer glibc ?


From: Dennis Clarke
Subject: No follow up on patches to support newer glibc ?
Date: Wed, 4 Apr 2018 13:03:36 -0400
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0


After all the vibrant discussion I was at least expecting a reply that
says "okay .. so that works" or perhaps a "ver 4.2.2 patches?" or
something.

What bothers me is that these patches are only needed on a i686 system
thus far.


Dennis



-------------------------------------------------------------------
FILE : make-4.2.1_linux_4.15.15-genunix_i686.005.patch01
-------------------------------------------------------------------
*** configure.ac_backup Mon Jun  6 12:27:31 2016
--- configure.ac        Mon Apr  2 16:57:41 2018
***************
*** 399,408 ****
  #include <glob.h>
  #include <fnmatch.h>

- #define GLOB_INTERFACE_VERSION 1
  #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
  # include <gnu-versions.h>
! # if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
     gnu glob
  # endif
  #endif],
--- 399,407 ----
  #include <glob.h>
  #include <fnmatch.h>

  #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
  # include <gnu-versions.h>
! # if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
     gnu glob
  # endif
  #endif],


-------------------------------------------------------------------
FILE make-4.2.1_linux_4.15.15-genunix_i686.005.patch02
-------------------------------------------------------------------
*** dir.c.orig  2016-05-31 07:17:26.000000000 +0000
--- dir.c       2018-04-03 03:25:44.892913153 +0000
***************
*** 1260,1276 ****
   * regular file; fix that here.
   */
  #if !defined(stat) && !defined(WINDOWS32) || defined(VMS)
! # ifndef VMS
! #  ifndef HAVE_SYS_STAT_H
  int stat (const char *path, struct stat *sbuf);
! #  endif
! # else
!     /* We are done with the fake stat.  Go back to the real stat */
! #   ifdef stat
! #     undef stat
! #   endif
! # endif
! # define local_stat stat
  #else
  static int
  local_stat (const char *path, struct stat *buf)
--- 1260,1276 ----
   * regular file; fix that here.
   */
  #if !defined(stat) && !defined(WINDOWS32) || defined(VMS)
! #ifndef VMS
! #ifndef HAVE_SYS_STAT_H
  int stat (const char *path, struct stat *sbuf);
! #endif
! #else
! /* We are done with the fake stat.  Go back to the real stat */
! #ifdef stat
! #undef stat
! #endif
! #endif
! #define local_stat stat
  #else
  static int
  local_stat (const char *path, struct stat *buf)
***************
*** 1293,1300 ****
          return -1;
      }
  #endif

!   EINTRLOOP (e, stat (path, buf));
    return e;
  }
  #endif
--- 1293,1322 ----
          return -1;
      }
  #endif
+ #endif

! /* Similarly for lstat.  */
! #if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
! #ifndef VMS
! #ifndef HAVE_SYS_STAT_H
! int lstat (const char *path, struct stat *sbuf);
! #endif
! #else
! /* We are done with the fake lstat.  Go back to the real lstat */
! #ifdef lstat
! #undef lstat
! #endif
! #endif
! #define local_lstat lstat
! #elif defined(WINDOWS32)
! /* Windows doesn't support lstat().  */
! #define local_lstat local_stat
! #else
! static int
! local_lstat (const char *path, struct stat *buf)
! {
!   int e;
!   EINTRLOOP (e, lstat (path, buf));
    return e;
  }
  #endif
***************
*** 1305,1313 ****
    gl->gl_opendir = open_dirstream;
    gl->gl_readdir = read_dirstream;
    gl->gl_closedir = free;
    gl->gl_stat = local_stat;
-   /* We don't bother setting gl_lstat, since glob never calls it.
-      The slot is only there for compatibility with 4.4 BSD.  */
  }

  void
--- 1327,1334 ----
    gl->gl_opendir = open_dirstream;
    gl->gl_readdir = read_dirstream;
    gl->gl_closedir = free;
+   gl->gl_lstat = local_lstat;
    gl->gl_stat = local_stat;
  }

  void






reply via email to

[Prev in Thread] Current Thread [Next in Thread]