commit: 0d8fcdb0bccfe0c41b887f39d94e105711dd917a
parent 4cf930a35550348540635a99839b0b639c3aa355
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 20 Feb 2020 18:49:02 -0800
musl: Update to 1.2.0
Diffstat:
5 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -170,7 +170,6 @@
[submodule "pkg/musl/src"]
path = pkg/musl/src
url = git://git.musl-libc.org/musl
- ignore = all
[submodule "pkg/ncompress/src"]
path = pkg/ncompress/src
url = https://github.com/vapier/ncompress.git
@@ -315,3 +314,6 @@
path = pkg/zstd/src
url = https://github.com/facebook/zstd
ignore = all
+[submodule "pkg/gpsd/src"]
+ path = pkg/gpsd/src
+ url = https://gitlab.com/gpsd/gpsd.git
diff --git a/pkg/musl/base.lua b/pkg/musl/base.lua
@@ -1514,6 +1514,7 @@ return {
},
bits={
-- <cd src/arch/generic/bits && printf "\t\t'%s',\n" *.h
+ 'dirent.h',
'errno.h',
'fcntl.h',
'fenv.h',
@@ -1524,6 +1525,7 @@ return {
'ipc.h',
'ipcstat.h',
'kd.h',
+ 'limits.h',
'link.h',
'mman.h',
'msg.h',
diff --git a/pkg/musl/patch/0001-unconditonally-define-alloca-as-__builtin_alloca.patch b/pkg/musl/patch/0001-unconditonally-define-alloca-as-__builtin_alloca.patch
@@ -1,31 +0,0 @@
-From 6713ec14544e51af61ac40b01b0021df791b38ea Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 19 Nov 2019 01:56:34 -0800
-Subject: [PATCH] unconditonally define alloca as __builtin_alloca
-
-This enables alternative compilers, which may not define __GNUC__,
-to implement alloca, which is still fairly widely used.
-
-This is similar to how stdarg.h already works in musl; compilers must
-implement __builtin_va_arg, there is no fallback definition.
----
- include/alloca.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/include/alloca.h b/include/alloca.h
-index d2e6f1c6..b8d183d1 100644
---- a/include/alloca.h
-+++ b/include/alloca.h
-@@ -10,9 +10,7 @@ extern "C" {
-
- void *alloca(size_t);
-
--#ifdef __GNUC__
- #define alloca __builtin_alloca
--#endif
-
- #ifdef __cplusplus
- }
---
-2.25.0
-
diff --git a/pkg/musl/ver b/pkg/musl/ver
@@ -1 +1 @@
-1.1.24 r1
+1.2.0 r0
diff --git a/pkg/musl/x86_64.lua b/pkg/musl/x86_64.lua
@@ -49,7 +49,6 @@ return {
},
bits={
-- <cd src/arch/x86_64/bits && printf "\t\t'%s',\n" *.h
- 'endian.h',
'fcntl.h',
'fenv.h',
'float.h',
@@ -62,7 +61,6 @@ return {
'sem.h',
'setjmp.h',
'signal.h',
- 'socket.h',
'stat.h',
'stdint.h',
'user.h',
