CVS commit: src/external/gpl2/gmake/dist/glob
Module Name:src Committed By: nonaka Date: Wed May 23 09:52:27 UTC 2018 Modified Files: src/external/gpl2/gmake/dist/glob: glob.c Log Message: gmake: __alloca and __stat are provided only when building with GLIBC. Fix a build failure on Ubuntu 18.04. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/gmake/dist/glob/glob.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gmake/dist/glob/glob.c diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.4 src/external/gpl2/gmake/dist/glob/glob.c:1.5 --- src/external/gpl2/gmake/dist/glob/glob.c:1.4 Mon Apr 16 16:11:40 2018 +++ src/external/gpl2/gmake/dist/glob/glob.c Wed May 23 09:52:27 2018 @@ -207,7 +207,7 @@ my_realloc (p, n) #endif /* __GNU_LIBRARY__ */ -#if !defined __alloca && !(defined __GNU_LIBRARY__ || defined __GLIBC__) +#if !defined __alloca # ifdef __GNUC__ # undef alloca @@ -230,7 +230,7 @@ extern char *alloca (); #endif -#ifndef __GNU_LIBRARY__ +#if !defined __stat # define __stat stat # ifdef STAT_MACROS_BROKEN # undef S_ISDIR
CVS commit: src/external/gpl2/gmake/dist
Module Name:src Committed By: nonaka Date: Tue May 1 00:39:58 UTC 2018 Modified Files: src/external/gpl2/gmake/dist: configure configure.in Log Message: gmake: Revert configure r1.2 and configure.in r1.2. > gmake: Apply patch to support GLIBC glob interface v2 > > http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116 > > Fix a build failure on Ubuntu 18.04. Don't apply an imcompatible license patch. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/configure \ src/external/gpl2/gmake/dist/configure.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gmake/dist/configure diff -u src/external/gpl2/gmake/dist/configure:1.2 src/external/gpl2/gmake/dist/configure:1.3 --- src/external/gpl2/gmake/dist/configure:1.2 Sat Apr 28 12:20:40 2018 +++ src/external/gpl2/gmake/dist/configure Tue May 1 00:39:58 2018 @@ -13619,9 +13619,10 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +#define GLOB_INTERFACE_VERSION 1 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 # include -# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 +# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION gnu glob # endif #endif Index: src/external/gpl2/gmake/dist/configure.in diff -u src/external/gpl2/gmake/dist/configure.in:1.2 src/external/gpl2/gmake/dist/configure.in:1.3 --- src/external/gpl2/gmake/dist/configure.in:1.2 Sat Apr 28 12:20:40 2018 +++ src/external/gpl2/gmake/dist/configure.in Tue May 1 00:39:58 2018 @@ -19,7 +19,7 @@ AC_INIT([GNU make],[3.81],[bug-m...@gnu.org]) AC_PREREQ(2.59) -AC_REVISION([[$Id: configure.in,v 1.2 2018/04/28 12:20:40 nonaka Exp $]]) +AC_REVISION([[$Id: configure.in,v 1.3 2018/05/01 00:39:58 nonaka Exp $]]) # Autoconf setup AC_CONFIG_AUX_DIR(config) @@ -351,9 +351,10 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [ #include #include +#define GLOB_INTERFACE_VERSION 1 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 # include -# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 +# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION gnu glob # endif #endif
CVS commit: src/external/gpl2/gmake/dist
Module Name:src
Committed By: nonaka
Date: Tue May 1 00:36:58 UTC 2018
Modified Files:
src/external/gpl2/gmake/dist: dir.c
Log Message:
gmake: Revert dir.c r.1.2.
> gmake: Make this work with glibc glob interface v2
>
> http://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81
Don't apply an imcompatible license patch.
Reported by kamil@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/dir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/gmake/dist/dir.c
diff -u src/external/gpl2/gmake/dist/dir.c:1.2 src/external/gpl2/gmake/dist/dir.c:1.3
--- src/external/gpl2/gmake/dist/dir.c:1.2 Mon Apr 30 04:17:27 2018
+++ src/external/gpl2/gmake/dist/dir.c Tue May 1 00:36:57 2018
@@ -1194,32 +1194,6 @@ local_stat (const char *path, struct sta
}
#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
-
void
dir_setup_glob (glob_t *gl)
{
@@ -1227,8 +1201,9 @@ dir_setup_glob (glob_t *gl)
gl->gl_opendir = open_dirstream;
gl->gl_readdir = read_dirstream;
gl->gl_closedir = ansi_free;
- gl->gl_lstat = local_lstat;
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
CVS commit: src/external/gpl2/gmake/dist
Module Name:src
Committed By: nonaka
Date: Mon Apr 30 04:17:27 UTC 2018
Modified Files:
src/external/gpl2/gmake/dist: dir.c
Log Message:
gmake: Make this work with glibc glob interface v2
http://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/dir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/gmake/dist/dir.c
diff -u src/external/gpl2/gmake/dist/dir.c:1.1.1.1 src/external/gpl2/gmake/dist/dir.c:1.2
--- src/external/gpl2/gmake/dist/dir.c:1.1.1.1 Mon Aug 18 06:46:58 2014
+++ src/external/gpl2/gmake/dist/dir.c Mon Apr 30 04:17:27 2018
@@ -1194,6 +1194,32 @@ local_stat (const char *path, struct sta
}
#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
+
void
dir_setup_glob (glob_t *gl)
{
@@ -1201,9 +1227,8 @@ dir_setup_glob (glob_t *gl)
gl->gl_opendir = open_dirstream;
gl->gl_readdir = read_dirstream;
gl->gl_closedir = ansi_free;
+ gl->gl_lstat = local_lstat;
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
CVS commit: src/external/gpl2/gmake/dist
Module Name:src Committed By: nonaka Date: Sat Apr 28 12:20:41 UTC 2018 Modified Files: src/external/gpl2/gmake/dist: configure configure.in Log Message: gmake: Apply patch to support GLIBC glob interface v2 http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116 Fix a build failure on Ubuntu 18.04. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/configure \ src/external/gpl2/gmake/dist/configure.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gmake/dist/configure diff -u src/external/gpl2/gmake/dist/configure:1.1.1.1 src/external/gpl2/gmake/dist/configure:1.2 --- src/external/gpl2/gmake/dist/configure:1.1.1.1 Mon Aug 18 06:46:54 2014 +++ src/external/gpl2/gmake/dist/configure Sat Apr 28 12:20:40 2018 @@ -13619,10 +13619,9 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include -#define GLOB_INTERFACE_VERSION 1 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 # include -# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION +# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 gnu glob # endif #endif Index: src/external/gpl2/gmake/dist/configure.in diff -u src/external/gpl2/gmake/dist/configure.in:1.1.1.1 src/external/gpl2/gmake/dist/configure.in:1.2 --- src/external/gpl2/gmake/dist/configure.in:1.1.1.1 Mon Aug 18 06:46:47 2014 +++ src/external/gpl2/gmake/dist/configure.in Sat Apr 28 12:20:40 2018 @@ -19,7 +19,7 @@ AC_INIT([GNU make],[3.81],[bug-m...@gnu.org]) AC_PREREQ(2.59) -AC_REVISION([[$Id: configure.in,v 1.1.1.1 2014/08/18 06:46:47 christos Exp $]]) +AC_REVISION([[$Id: configure.in,v 1.2 2018/04/28 12:20:40 nonaka Exp $]]) # Autoconf setup AC_CONFIG_AUX_DIR(config) @@ -351,10 +351,9 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [ #include #include -#define GLOB_INTERFACE_VERSION 1 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 # include -# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION +# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 gnu glob # endif #endif
CVS commit: src/external/gpl2/gmake/dist/glob
Module Name:src Committed By: christos Date: Mon Apr 16 16:11:40 UTC 2018 Modified Files: src/external/gpl2/gmake/dist/glob: glob.c Log Message: According to: https://sourceforge.net/p/predef/wiki/Libraries/ The macro used for old glibc is __GNU_LIBRARY__ and the new one is __GLIBC__. Try to fix linux compilation by detecting both. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/gmake/dist/glob/glob.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gmake/dist/glob/glob.c diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.3 src/external/gpl2/gmake/dist/glob/glob.c:1.4 --- src/external/gpl2/gmake/dist/glob/glob.c:1.3 Mon Apr 16 12:02:57 2018 +++ src/external/gpl2/gmake/dist/glob/glob.c Mon Apr 16 12:11:40 2018 @@ -207,7 +207,7 @@ my_realloc (p, n) #endif /* __GNU_LIBRARY__ */ -#if !defined __alloca && !defined __GNU_LIBRARY__ +#if !defined __alloca && !(defined __GNU_LIBRARY__ || defined __GLIBC__) # ifdef __GNUC__ # undef alloca
CVS commit: src/external/gpl2/gmake/dist/glob
Module Name:src Committed By: kamil Date: Mon Apr 16 16:02:57 UTC 2018 Modified Files: src/external/gpl2/gmake/dist/glob: glob.c Log Message: Revert previous glob.c change It broke on !GLIBC. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/glob/glob.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gmake/dist/glob/glob.c diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.2 src/external/gpl2/gmake/dist/glob/glob.c:1.3 --- src/external/gpl2/gmake/dist/glob/glob.c:1.2 Mon Apr 16 14:39:19 2018 +++ src/external/gpl2/gmake/dist/glob/glob.c Mon Apr 16 16:02:57 2018 @@ -207,7 +207,7 @@ my_realloc (p, n) #endif /* __GNU_LIBRARY__ */ -#if !defined __alloca && defined __GNU_LIBRARY__ +#if !defined __alloca && !defined __GNU_LIBRARY__ # ifdef __GNUC__ # undef alloca
CVS commit: src/external/gpl2/gmake/dist/glob
Module Name:src Committed By: kamil Date: Mon Apr 16 14:39:19 UTC 2018 Modified Files: src/external/gpl2/gmake/dist/glob: glob.c Log Message: Fix build of gmake (in tools) on new GLIBC systems Reported on Debian and Fedora. Reference for similar fix: https://lists.nongnu.org/archive/html/bug-make/2017-11/msg00020.html Tested by on Fedora. Tested by on Debian. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/glob/glob.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gmake/dist/glob/glob.c diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.1.1.1 src/external/gpl2/gmake/dist/glob/glob.c:1.2 --- src/external/gpl2/gmake/dist/glob/glob.c:1.1.1.1 Mon Aug 18 06:47:54 2014 +++ src/external/gpl2/gmake/dist/glob/glob.c Mon Apr 16 14:39:19 2018 @@ -207,7 +207,7 @@ my_realloc (p, n) #endif /* __GNU_LIBRARY__ */ -#if !defined __alloca && !defined __GNU_LIBRARY__ +#if !defined __alloca && defined __GNU_LIBRARY__ # ifdef __GNUC__ # undef alloca
CVS commit: src/external/gpl2/gmake/dist/config
Module Name:src
Committed By: wiz
Date: Mon Aug 18 07:12:47 UTC 2014
Modified Files:
src/external/gpl2/gmake/dist/config: config.guess
Log Message:
Put local change in sorted location.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/config/config.guess
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/gmake/dist/config/config.guess
diff -u src/external/gpl2/gmake/dist/config/config.guess:1.2 src/external/gpl2/gmake/dist/config/config.guess:1.3
--- src/external/gpl2/gmake/dist/config/config.guess:1.2 Mon Aug 18 06:57:25 2014
+++ src/external/gpl2/gmake/dist/config/config.guess Mon Aug 18 07:12:47 2014
@@ -939,12 +939,12 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
-vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
tile*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
CVS commit: src/external/gpl2/gmake/dist
Module Name:src
Committed By: christos
Date: Mon Aug 18 06:57:25 UTC 2014
Modified Files:
src/external/gpl2/gmake/dist: Makefile.in
src/external/gpl2/gmake/dist/config: config.guess
src/external/gpl2/gmake/dist/po: Makefile.in.in
Removed Files:
src/external/gpl2/gmake/dist/doc: make.info make.info-1 make.info-2
Log Message:
merge local changes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/config/config.guess
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/gmake/dist/doc/make.info \
src/external/gpl2/gmake/dist/doc/make.info-1 \
src/external/gpl2/gmake/dist/doc/make.info-2
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/po/Makefile.in.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/gmake/dist/Makefile.in
diff -u src/external/gpl2/gmake/dist/Makefile.in:1.1.1.1 src/external/gpl2/gmake/dist/Makefile.in:1.2
--- src/external/gpl2/gmake/dist/Makefile.in:1.1.1.1 Mon Aug 18 02:46:49 2014
+++ src/external/gpl2/gmake/dist/Makefile.in Mon Aug 18 02:57:25 2014
@@ -330,6 +330,8 @@ all: config.h
am--refresh:
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_Makefile.in:
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -357,6 +359,8 @@ $(top_builddir)/config.status: $(top_src
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_configure:
cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -371,6 +375,8 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_config.h.in:
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
Index: src/external/gpl2/gmake/dist/config/config.guess
diff -u src/external/gpl2/gmake/dist/config/config.guess:1.1.1.1 src/external/gpl2/gmake/dist/config/config.guess:1.2
--- src/external/gpl2/gmake/dist/config/config.guess:1.1.1.1 Mon Aug 18 02:47:09 2014
+++ src/external/gpl2/gmake/dist/config/config.guess Mon Aug 18 02:57:25 2014
@@ -942,6 +942,9 @@ EOF
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
+tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
Index: src/external/gpl2/gmake/dist/po/Makefile.in.in
diff -u src/external/gpl2/gmake/dist/po/Makefile.in.in:1.1.1.1 src/external/gpl2/gmake/dist/po/Makefile.in.in:1.2
--- src/external/gpl2/gmake/dist/po/Makefile.in.in:1.1.1.1 Mon Aug 18 02:47:14 2014
+++ src/external/gpl2/gmake/dist/po/Makefile.in.in Mon Aug 18 02:57:25 2014
@@ -13,7 +13,7 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-SHELL = /bin/sh
+SHELL = @SHELL@
@SET_MAKE@
srcdir = @srcdir@
