mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
@@ -0,0 +1,31 @@
|
||||
From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Smith <psmith@gnu.org>
|
||||
Date: Sun, 19 Nov 2017 15:09:16 -0500
|
||||
Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit 48c8a116a914a3
|
||||
|
||||
configure.ac | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8c72568cf276..4710832ae568 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
|
||||
#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
|
||||
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
|
||||
gnu glob
|
||||
# endif
|
||||
#endif],
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 24 Sep 2017 09:12:58 -0400
|
||||
Subject: [PATCH] glob: Do not assume glibc glob internals.
|
||||
|
||||
It has been proposed that glibc glob start using gl_lstat,
|
||||
which the API allows it to do. GNU 'make' should not get in
|
||||
the way of this. See:
|
||||
https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
|
||||
|
||||
* dir.c (local_lstat): New function, like local_stat.
|
||||
(dir_setup_glob): Use it to initialize gl_lstat too, as the API
|
||||
requires.
|
||||
|
||||
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
|
||||
(from upstream commit 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4)
|
||||
---
|
||||
dir.c | 29 +++++++++++++++++++++++++++--
|
||||
1 file changed, 27 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dir.c b/dir.c
|
||||
index adbb8a9..c343e4c 100644
|
||||
--- a/dir.c
|
||||
+++ b/dir.c
|
||||
@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
|
||||
}
|
||||
#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)
|
||||
{
|
||||
gl->gl_opendir = open_dirstream;
|
||||
gl->gl_readdir = read_dirstream;
|
||||
gl->gl_closedir = 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
|
||||
--
|
||||
2.21.0
|
||||
|
||||
12
package/make/Config.in
Normal file
12
package/make/Config.in
Normal file
@@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_MAKE
|
||||
bool "make"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
A tool which controls the generation of executables and other
|
||||
non-source files of a program from the program's source files.
|
||||
|
||||
While Buildroot no longer supports building a toolchain for
|
||||
the target, we keep a make package that is for example
|
||||
useful to run the uClibc test suite on the target.
|
||||
|
||||
http://www.gnu.org/software/make/
|
||||
4
package/make/make.hash
Normal file
4
package/make/make.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# From http://lists.gnu.org/archive/html/info-gnu/2016-06/msg00005.html
|
||||
md5 15b012617e7c44c0ed482721629577ac make-4.2.1.tar.bz2
|
||||
# Locally calculated after checking signature
|
||||
sha256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2
|
||||
31
package/make/make.mk
Normal file
31
package/make/make.mk
Normal file
@@ -0,0 +1,31 @@
|
||||
################################################################################
|
||||
#
|
||||
# make
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MAKE_VERSION = 4.2.1
|
||||
MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
|
||||
MAKE_SITE = $(BR2_GNU_MIRROR)/make
|
||||
MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf
|
||||
MAKE_LICENSE = GPL-3.0+
|
||||
MAKE_LICENSE_FILES = COPYING
|
||||
# Patching configure.ac
|
||||
MAKE_AUTORECONF = YES
|
||||
|
||||
MAKE_CONF_OPTS = --without-guile
|
||||
|
||||
# Disable the 'load' operation for static builds since it needs dlopen
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
MAKE_CONF_OPTS += --disable-load
|
||||
endif
|
||||
|
||||
HOST_MAKE_DEPENDENCIES = host-pkgconf
|
||||
HOST_MAKE_CONF_OPTS = --without-guile
|
||||
|
||||
# Configure host-make binary to be 'host-make' to ensure it isn't
|
||||
# accidently used by packages when they invoke recursive / sub-make.
|
||||
HOST_MAKE_CONF_OPTS += --program-prefix=host-
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user