logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 89a5a575b4bd83978512f429697b0199c692250c
parent efa6a6e1b530c15f981c291d4ff0957182a9cd89
Author: hovercats <hovercatswithlasereyes@protonmail.com>
Date:   Fri,  5 Jan 2024 03:40:27 +0100

make: 4.4.1

Diffstat:

Mpkg/make/.gitignore2+-
Mpkg/make/config.h512+++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
Mpkg/make/gen.lua11++++++-----
Mpkg/make/sha2562+-
Mpkg/make/url2+-
Mpkg/make/ver2+-
6 files changed, 354 insertions(+), 177 deletions(-)

diff --git a/pkg/make/.gitignore b/pkg/make/.gitignore @@ -1,2 +1,2 @@ -/make-4.3.tar.gz +/make-4.4.1.tar.gz /src diff --git a/pkg/make/config.h b/pkg/make/config.h @@ -3,33 +3,12 @@ #define LOCALEDIR "/share/locale" /* #undef AC_APPLE_UNIVERSAL_BUILD */ -/* #undef BITSIZEOF_PTRDIFF_T */ -/* #undef BITSIZEOF_SIG_ATOMIC_T */ -/* #undef BITSIZEOF_SIZE_T */ -/* #undef BITSIZEOF_WCHAR_T */ -/* #undef BITSIZEOF_WINT_T */ /* #undef CLOSEDIR_VOID */ -/* #undef CRAY_STACKSEG_END */ /* #undef C_ALLOCA */ /* #undef DGUX */ -/* #undef DOUBLE_SLASH_IS_DISTINCT_ROOT */ /* #undef ENABLE_NLS */ -/* #undef FCNTL_DUPFD_BUGGY */ #define FILE_TIMESTAMP_HI_RES 1 -#define GNULIB_FSCANF 1 -#define GNULIB_MSVC_NOTHROW 1 -/* #undef GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU */ -#define GNULIB_SCANF 1 -#define GNULIB_STRERROR 1 -#define GNULIB_TEST_ACCESS 1 -#define GNULIB_TEST_CLOSE 1 -#define GNULIB_TEST_DUP2 1 -#define GNULIB_TEST_FCNTL 1 -#define GNULIB_TEST_GETDTABLESIZE 1 #define GNULIB_TEST_GETLOADAVG 1 -#define GNULIB_TEST_MALLOC_POSIX 1 -#define GNULIB_TEST_STPCPY 1 -#define GNULIB_TEST_STRERROR 1 #define HAVE_ALLOCA 1 #define HAVE_ALLOCA_H 1 #define HAVE_ATEXIT 1 @@ -37,39 +16,33 @@ /* #undef HAVE_CFLOCALECOPYCURRENT */ /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ #define HAVE_CLOCK_GETTIME 1 +/* #undef HAVE_C_BOOL */ /* #undef HAVE_DCGETTEXT */ #define HAVE_DECL_BSD_SIGNAL 1 #define HAVE_DECL_DLERROR 1 #define HAVE_DECL_DLOPEN 1 #define HAVE_DECL_DLSYM 1 -#define HAVE_DECL_GETDTABLESIZE 1 -#define HAVE_DECL_PROGRAM_INVOCATION_NAME 1 -#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 1 -#define HAVE_DECL_STRERROR_R 1 +#define HAVE_DECL_GETLOADAVG 1 #define HAVE_DECL_SYS_SIGLIST 0 #define HAVE_DECL__SYS_SIGLIST 0 -#define HAVE_DECL___ARGV 0 #define HAVE_DECL___SYS_SIGLIST 0 #define HAVE_DIRENT_H 1 /* #undef HAVE_DOS_PATHS */ #define HAVE_DUP 1 #define HAVE_DUP2 1 -#define HAVE_FCNTL 1 #define HAVE_FCNTL_H 1 #define HAVE_FDOPEN 1 #define HAVE_FORK 1 #define HAVE_GETCWD 1 -#define HAVE_GETDTABLESIZE 1 -/* #undef HAVE_GETEXECNAME */ #define HAVE_GETGROUPS 1 /* #undef HAVE_GETHOSTBYNAME */ /* #undef HAVE_GETHOSTNAME */ -/* #undef HAVE_GETPROGNAME */ #define HAVE_GETRLIMIT 1 /* #undef HAVE_GETTEXT */ #define HAVE_GETTIMEOFDAY 1 /* #undef HAVE_GUILE */ -#define HAVE_ICONV 1 +/* #undef HAVE_ICONV */ +#define HAVE_INTMAX_T 1 #define HAVE_INTTYPES_H 1 #define HAVE_ISATTY 1 /* #undef HAVE_LIBDGC */ @@ -80,12 +53,13 @@ #define HAVE_LONG_LONG_INT 1 #define HAVE_LSTAT 1 /* #undef HAVE_MACH_MACH_H */ -#define HAVE_MALLOC_POSIX 1 #define HAVE_MEMORY_H 1 +#define HAVE_MEMPCPY 1 #define HAVE_MEMRCHR 1 +/* #undef HAVE_MINIX_CONFIG_H */ +#define HAVE_MKFIFO 1 #define HAVE_MKSTEMP 1 #define HAVE_MKTEMP 1 -/* #undef HAVE_MSVC_INVALID_PARAMETER_HANDLER */ /* #undef HAVE_NDIR_H */ /* #undef HAVE_NLIST_H */ #define HAVE_PIPE 1 @@ -96,7 +70,6 @@ #define HAVE_READLINK 1 #define HAVE_REALPATH 1 #define HAVE_SA_RESTART 1 -/* #undef HAVE_SETDTABLESIZE */ #define HAVE_SETEGID 1 #define HAVE_SETEUID 1 #define HAVE_SETLINEBUF 1 @@ -105,20 +78,20 @@ #define HAVE_SETRLIMIT 1 #define HAVE_SETVBUF 1 #define HAVE_SIGACTION 1 -/* #undef HAVE_SIGNED_SIG_ATOMIC_T */ -/* #undef HAVE_SIGNED_WCHAR_T */ -/* #undef HAVE_SIGNED_WINT_T */ /* #undef HAVE_SIGSETMASK */ +#define HAVE_SIG_ATOMIC_T 1 /* #undef HAVE_SOCKET */ #define HAVE_SPAWN_H 1 +#define HAVE_STDBOOL_H 1 #define HAVE_STDINT_H 1 +#define HAVE_STDIO_H 1 #define HAVE_STDLIB_H 1 #define HAVE_STPCPY 1 #define HAVE_STRCASECMP 1 /* #undef HAVE_STRCMPI */ #define HAVE_STRCOLL 1 #define HAVE_STRDUP 1 -#define HAVE_STRERROR_R 1 +#define HAVE_STRERROR 1 /* #undef HAVE_STRICMP */ #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 @@ -127,19 +100,16 @@ #define HAVE_STRNDUP 1 /* #undef HAVE_STRNICMP */ #define HAVE_STRSIGNAL 1 +#define HAVE_STRTOLL 1 #define HAVE_STRUCT_DIRENT_D_TYPE 1 /* #undef HAVE_STRUCT_NLIST_N_UN_N_NAME */ -#define HAVE_SYMLINK 1 -/* #undef HAVE_SYS_BITYPES_H */ /* #undef HAVE_SYS_DIR_H */ #define HAVE_SYS_FILE_H 1 -/* #undef HAVE_SYS_INTTYPES_H */ /* #undef HAVE_SYS_LOADAVG_H */ /* #undef HAVE_SYS_NDIR_H */ #define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_RESOURCE_H 1 #define HAVE_SYS_SELECT_H 1 -#define HAVE_SYS_SOCKET_H 1 #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TIMEB_H 1 #define HAVE_SYS_TIME_H 1 @@ -151,51 +121,35 @@ /* #undef HAVE_UNION_WAIT */ #define HAVE_UNISTD_H 1 #define HAVE_UNSIGNED_LONG_LONG_INT 1 -/* #undef HAVE_VAR___PROGNAME */ #define HAVE_VFORK 1 /* #undef HAVE_VFORK_H */ #define HAVE_WAIT3 1 #define HAVE_WAITPID 1 #define HAVE_WCHAR_H 1 -#define HAVE_WCHAR_T 1 -/* #undef HAVE_WINSOCK2_H */ -#define HAVE_WINT_T 1 #define HAVE_WORKING_FORK 1 -#define HAVE_WORKING_O_NOATIME 1 -#define HAVE_WORKING_O_NOFOLLOW 1 #define HAVE_WORKING_VFORK 1 -#define HAVE__BOOL 1 -/* #undef HAVE__SET_INVALID_PARAMETER_HANDLER */ +#define MAKE_CXX "g++" #define MAKE_HOST "x86_64-pc-linux-musl" #define MAKE_JOBSERVER 1 #define MAKE_LOAD 1 #define MAKE_SYMLINKS 1 -#ifndef __USE_MINGW_ANSI_STDIO -# define __USE_MINGW_ANSI_STDIO 1 -#endif +#define MK_CONFIGURE 1 /* #undef N_NAME_POINTER */ #define PACKAGE "make" #define PACKAGE_BUGREPORT "bug-make@gnu.org" -#define PACKAGE_NAME "GNU make" -#define PACKAGE_STRING "GNU make 4.3" +#define PACKAGE_NAME "GNU Make" +#define PACKAGE_STRING "GNU Make 4.4.1" #define PACKAGE_TARNAME "make" -#define PACKAGE_URL "http://www.gnu.org/software/make/" -#define PACKAGE_VERSION "4.3" +#define PACKAGE_URL "https://www.gnu.org/software/make/" +#define PACKAGE_VERSION "4.4.1" #define PATH_SEPARATOR_CHAR ':' -/* #undef PTRDIFF_T_SUFFIX */ -/* #undef REPLACE_STRERROR_0 */ -#define RETSIGTYPE void #define SCCS_GET "get" /* #undef SCCS_GET_MINUS_G */ -/* #undef SIG_ATOMIC_T_SUFFIX */ -/* #undef SIZE_T_SUFFIX */ /* #undef STACK_DIRECTION */ /* #undef STAT_MACROS_BROKEN */ #define STDC_HEADERS 1 -/* #undef STRERROR_R_CHAR_P */ #define ST_MTIM_NSEC st_mtim.tv_nsec /* #undef SVR4 */ -#define TIME_WITH_SYS_TIME 1 /* #undef UMAX */ /* #undef UMAX4_3 */ #define USE_POSIX_SPAWN 1 @@ -205,15 +159,30 @@ #ifndef _DARWIN_C_SOURCE # define _DARWIN_C_SOURCE 1 #endif +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +#ifndef _MINIX +/* # undef _MINIX */ +#endif #ifndef _NETBSD_SOURCE # define _NETBSD_SOURCE 1 #endif #ifndef _OPENBSD_SOURCE # define _OPENBSD_SOURCE 1 #endif +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif #ifndef _POSIX_PTHREAD_SEMANTICS # define _POSIX_PTHREAD_SEMANTICS 1 #endif @@ -226,6 +195,9 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # define __STDC_WANT_IEC_60559_DFP_EXT__ 1 #endif +#ifndef __STDC_WANT_IEC_60559_EXT__ +# define __STDC_WANT_IEC_60559_EXT__ 1 +#endif #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 #endif @@ -244,16 +216,8 @@ #ifndef _XOPEN_SOURCE /* # undef _XOPEN_SOURCE */ #endif -#ifndef _HPUX_ALT_XOPEN_SOCKET_API -# define _HPUX_ALT_XOPEN_SOCKET_API 1 -#endif -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif -#define VERSION "4.3" -/* #undef WCHAR_T_SUFFIX */ +#define VERSION "4.4.1" /* #undef WINDOWS32 */ -/* #undef WINT_T_SUFFIX */ /* #undef WITH_DMALLOC */ #if defined AC_APPLE_UNIVERSAL_BUILD # if defined __BIG_ENDIAN__ @@ -264,23 +228,32 @@ /* # undef WORDS_BIGENDIAN */ # endif #endif -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif /* #undef _FILE_OFFSET_BITS */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define _GL_GNUC_PREREQ(major, minor) \ + ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__)) +#else +# define _GL_GNUC_PREREQ(major, minor) 0 +#endif +/* #undef _ISOC11_SOURCE */ /* #undef _LARGE_FILES */ -/* #undef _MINIX */ -#define _NETBSD_SOURCE 1 #ifndef _Noreturn # if (defined __cplusplus \ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ || (defined _MSC_VER && 1900 <= _MSC_VER)) \ && 0) # define _Noreturn [[noreturn]] +# elif (defined __clang__ && __clang_major__ < 16 \ + && defined _GL_WORK_AROUND_LLVM_BUG_59792) +# define _Noreturn # elif ((!defined __cplusplus || defined __clang__) \ - && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))) -# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C + && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ + || (!defined __STRICT_ANSI__ \ + && (_GL_GNUC_PREREQ (4, 7) \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))))) +# elif _GL_GNUC_PREREQ (2, 8) || defined __clang__ || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) # elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) @@ -288,107 +261,310 @@ # define _Noreturn # endif #endif -/* #undef _POSIX_1_SOURCE */ -/* #undef _POSIX_SOURCE */ -#define _USE_STD_STAT 1 -/* #undef __STDC_CONSTANT_MACROS */ -/* #undef __STDC_LIMIT_MACROS */ +/* #undef _TIME_BITS */ +/* #undef __MINGW_USE_VC2005_COMPAT */ #define _GL_ASYNC_SAFE -/* #undef const */ -/* #undef eaccess */ -#if (((defined __APPLE__ && defined __MACH__) \ - || defined __DragonFly__ || defined __FreeBSD__) \ - && (defined __header_inline \ - ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ - && ! defined __clang__) \ - : ((! defined _DONT_USE_CTYPE_INLINE_ \ - && (defined __GNUC__ || defined __cplusplus)) \ - || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ - && defined __GNUC__ && ! defined __cplusplus)))) -# define _GL_EXTERN_INLINE_STDHEADER_BUG -#endif -#if ((__GNUC__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : (199901L <= __STDC_VERSION__ \ - && !defined __HP_cc \ - && !defined __PGI \ - && !(defined __SUNPRO_C && __STDC__))) \ - && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) -# define _GL_INLINE inline -# define _GL_EXTERN_INLINE extern inline -# define _GL_EXTERN_INLINE_IN_USE -#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ - && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) -# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ -# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +#if (defined __has_attribute \ + && (!defined __clang_minor__ \ + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 3 < __clang_major__ + (5 <= __clang_minor__)))) +# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) +#else +# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr +# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2) +# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95) +# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_diagnose_if 0 +# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3) +# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1) +# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) +# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) +# ifdef _ICC +# define _GL_ATTR_may_alias 0 # else -# define _GL_INLINE extern inline +# define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) # endif -# define _GL_EXTERN_INLINE extern -# define _GL_EXTERN_INLINE_IN_USE -#else -# define _GL_INLINE static _GL_UNUSED -# define _GL_EXTERN_INLINE static _GL_UNUSED +# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) +# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) +# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3) +# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96) +# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9) +# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0) +# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7) +# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) +#endif +#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ + && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) +# pragma GCC diagnostic ignored "-Wpedantic" #endif -#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ -# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ -# define _GL_INLINE_HEADER_CONST_PRAGMA +#ifndef _GL_ATTRIBUTE_ALLOC_SIZE +# if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) # else -# define _GL_INLINE_HEADER_CONST_PRAGMA \ - _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") -# endif -# define _GL_INLINE_HEADER_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ - _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ - _GL_INLINE_HEADER_CONST_PRAGMA -# define _GL_INLINE_HEADER_END \ - _Pragma ("GCC diagnostic pop") -#else -# define _GL_INLINE_HEADER_BEGIN -# define _GL_INLINE_HEADER_END +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) +# endif +#endif +#ifndef _GL_ATTRIBUTE_ALWAYS_INLINE +# if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +# else +# define _GL_ATTRIBUTE_ALWAYS_INLINE +# endif +#endif +#ifndef _GL_ATTRIBUTE_ARTIFICIAL +# if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +# else +# define _GL_ATTRIBUTE_ARTIFICIAL +# endif +#endif +#ifndef _GL_ATTRIBUTE_COLD +# if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) +# else +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) +# endif +# else +# define _GL_ATTRIBUTE_COLD +# endif +#endif +#ifndef _GL_ATTRIBUTE_CONST +# if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +# else +# define _GL_ATTRIBUTE_CONST +# endif +#endif +#ifndef _GL_ATTRIBUTE_DEALLOC +# if _GL_GNUC_PREREQ (11, 0) +# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) +# else +# define _GL_ATTRIBUTE_DEALLOC(f, i) +# endif +#endif +#ifndef _GL_ATTRIBUTE_DEALLOC_FREE +# if defined __cplusplus && defined __GNUC__ && !defined __clang__ +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +# else +# define _GL_ATTRIBUTE_DEALLOC_FREE \ + _GL_ATTRIBUTE_DEALLOC (free, 1) +# endif +#endif +#ifndef _GL_ATTRIBUTE_DEPRECATED +# ifdef __has_c_attribute +# if __has_c_attribute (__deprecated__) +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +# endif +# ifndef _GL_ATTRIBUTE_DEPRECATED +# define _GL_ATTRIBUTE_DEPRECATED +# endif +#endif +#if !(defined _GL_ATTRIBUTE_ERROR && defined _GL_ATTRIBUTE_WARNING) +# if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +# elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +# else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) +# endif +#endif +#ifndef _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +# if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +# else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE +# endif +#endif +#ifndef _GL_ATTRIBUTE_FALLTHROUGH +# ifdef __has_c_attribute +# if __has_c_attribute (__fallthrough__) +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +# ifndef _GL_ATTRIBUTE_FALLTHROUGH +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) +# endif +#endif +#ifndef _GL_ATTRIBUTE_FORMAT +# if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +# else +# define _GL_ATTRIBUTE_FORMAT(spec) +# endif #endif +#ifndef _GL_ATTRIBUTE_LEAF +# if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +# else +# define _GL_ATTRIBUTE_LEAF +# endif +#endif +#ifndef _GL_ATTRIBUTE_MALLOC +# if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +# else +# define _GL_ATTRIBUTE_MALLOC +# endif +#endif +#ifndef _GL_ATTRIBUTE_MAY_ALIAS +# if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +# else +# define _GL_ATTRIBUTE_MAY_ALIAS +# endif +#endif +#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED +# if defined __clang__ && defined __cplusplus +# if !defined __apple_build_version__ && __clang_major__ >= 10 +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# elif defined __has_c_attribute +# if __has_c_attribute (__maybe_unused__) +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# endif +# ifndef _GL_ATTRIBUTE_MAYBE_UNUSED +# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED +# endif +#endif +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED +#define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED +#ifndef _GL_ATTRIBUTE_NODISCARD +# if defined __clang__ && defined __cplusplus +# if __clang_major__ >= 1000 +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +# endif +# elif defined __has_c_attribute +# if __has_c_attribute (__nodiscard__) +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +# endif +# endif +# if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +# endif +# ifndef _GL_ATTRIBUTE_NODISCARD +# define _GL_ATTRIBUTE_NODISCARD +# endif +#endif +#ifndef _GL_ATTRIBUTE_NOINLINE +# if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +# else +# define _GL_ATTRIBUTE_NOINLINE +# endif +#endif +#ifndef _GL_ATTRIBUTE_NONNULL +# if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +# else +# define _GL_ATTRIBUTE_NONNULL(args) +# endif +#endif +#ifndef _GL_ATTRIBUTE_NONSTRING +# if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +# else +# define _GL_ATTRIBUTE_NONSTRING +# endif +#endif +#ifndef _GL_ATTRIBUTE_NOTHROW +# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +# else +# define _GL_ATTRIBUTE_NOTHROW +# endif +#endif +#ifndef _GL_ATTRIBUTE_PACKED +# if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +# else +# define _GL_ATTRIBUTE_PACKED +# endif +#endif +#ifndef _GL_ATTRIBUTE_PURE +# if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE +# endif +#endif +#ifndef _GL_ATTRIBUTE_RETURNS_NONNULL +# if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +# else +# define _GL_ATTRIBUTE_RETURNS_NONNULL +# endif +#endif +#ifndef _GL_ATTRIBUTE_SENTINEL +# if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +# else +# define _GL_ATTRIBUTE_SENTINEL(pos) +# endif +#endif +#ifndef _GL_ATTRIBUTE_UNUSED +# if _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define _GL_ATTRIBUTE_UNUSED +# endif +#endif +#ifndef _GL_UNUSED_LABEL +# if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__ +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED +# else +# define _GL_UNUSED_LABEL +# endif +#endif +/* #undef const */ +/* #undef eaccess */ /* #undef gid_t */ +/* #undef intmax_t */ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ # define __GNUC_STDC_INLINE__ 1 #endif -/* #undef mode_t */ +#define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2))) /* #undef off_t */ /* #undef pid_t */ -#define restrict __restrict -#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ -# define _Restrict -# define __restrict__ -#endif +/* #undef sig_atomic_t */ /* #undef size_t */ /* #undef ssize_t */ /* #undef uid_t */ /* #undef uintmax_t */ -#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -# define _GL_UNUSED __attribute__ ((__unused__)) -#else -# define _GL_UNUSED -#endif -#define _UNUSED_PARAMETER_ _GL_UNUSED -#if !defined __cplusplus || __GNUC__ > 4 \ - || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -# define _GL_UNUSED_LABEL _GL_UNUSED -#else -# define _GL_UNUSED_LABEL -#endif -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -#else -# define _GL_ATTRIBUTE_PURE /* empty */ -#endif -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -#else -# define _GL_ATTRIBUTE_CONST /* empty */ -#endif -#if 3 <= __GNUC__ -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -#else -# define _GL_ATTRIBUTE_MALLOC /* empty */ -#endif /* #undef vfork */ +#ifndef HAVE_C_BOOL +# if !defined __cplusplus && !defined __bool_true_false_are_defined +# if HAVE_STDBOOL_H +# include <stdbool.h> +# else +# if defined __SUNPRO_C +# error "<stdbool.h> is not usable with this configuration. To make it usable, add -D_STDC_C99= to $CC." +# else +# error "<stdbool.h> does not exist on this platform. Use gnulib module 'stdbool-c99' instead of gnulib module 'stdbool'." +# endif +# endif +# endif +# if !true +# define true (!false) +# endif +#endif diff --git a/pkg/make/gen.lua b/pkg/make/gen.lua @@ -17,8 +17,8 @@ pkg.deps = { lib('libgnu.a', [[ lib/( - concat-filename.c exitfail.c findprog-in.c fnmatch.c - glob.c xalloc-die.c xconcat-filename.c + concat-filename.c findprog-in.c fnmatch.c + getloadavg.c glob.c ) ]]) @@ -30,9 +30,10 @@ exe('make', [[ getopt1.c guile.c hash.c implicit.c job.c load.c loadapi.c main.c misc.c - output.c read.c remake.c - rule.c signame.c strcache.c - variable.c version.c vpath.c + output.c read.c + remake.c rule.c shuffle.c + signame.c strcache.c variable.c + version.c vpath.c posixos.c remote-stub.c diff --git a/pkg/make/sha256 b/pkg/make/sha256 @@ -1 +1 @@ -e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19 make-4.3.tar.gz +dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 make-4.4.1.tar.gz diff --git a/pkg/make/url b/pkg/make/url @@ -1 +1 @@ -url = "http://ftp.gnu.org/gnu/make/make-4.3.tar.gz" +url = "http://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz" diff --git a/pkg/make/ver b/pkg/make/ver @@ -1 +1 @@ -4.3 r0 +4.4.1 r0