Browse Source

musl: Updated (1.1.6 -> 1.1.12)

master
Nagy Károly Gábriel 9 years ago
parent
commit
6bc300f415
4 changed files with 7 additions and 65 deletions
  1. +0
    -59
      base/musl/0001-fix-incorrect-void-return-type-for-syncfs-function.patch
  2. +2
    -1
      base/musl/musl.conf
  3. +2
    -2
      base/musl/musl.desc
  4. +3
    -3
      base/musl/parse-config-9

+ 0
- 59
base/musl/0001-fix-incorrect-void-return-type-for-syncfs-function.patch

@ -1,59 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/0001-fix-incorrect-void-return-type-for-syncfs-function.patch
# Copyright (C) 2015 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From 11894f6d3a80be950a490dc7dfab349f057a545f Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 9 Jul 2015 17:07:35 +0000
Subject: fix incorrect void return type for syncfs function
being nonstandard, the closest thing to a specification for this
function is its man page, which documents it as returning int. it can
fail with EBADF if the file descriptor passed is invalid.
---
include/unistd.h | 2 +-
src/linux/syncfs.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/unistd.h b/include/unistd.h
index 0fe75d5..760a165 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -185,7 +185,7 @@ int setresgid(gid_t, gid_t, gid_t);
int getresuid(uid_t *, uid_t *, uid_t *);
int getresgid(gid_t *, gid_t *, gid_t *);
char *get_current_dir_name(void);
-void syncfs(int);
+int syncfs(int);
int euidaccess(const char *, int);
int eaccess(const char *, int);
#endif
diff --git a/src/linux/syncfs.c b/src/linux/syncfs.c
index fe2b8a7..bc7d301 100644
--- a/src/linux/syncfs.c
+++ b/src/linux/syncfs.c
@@ -2,7 +2,7 @@
#include <unistd.h>
#include "syscall.h"
-void syncfs(int fd)
+int syncfs(int fd)
{
- __syscall(SYS_syncfs, fd);
+ return syscall(SYS_syncfs, fd);
}
--
cgit v0.11.2

+ 2
- 1
base/musl/musl.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/musl.conf
# Copyright (C) 2012 - 2014 The OpenSDE Project
# Copyright (C) 2012 - 2015 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -54,6 +54,7 @@ if [ "$SDECFG_LIBC" == "musl" ]; then
if ! atstage toolchain; then
hook_add postinstall 5 'musl_postinstall'
fi
hook_add postflist 9 "rm -rf $root/$includedir/libintl.h"
fi
# always install the headers even if already present in the sandbox

+ 2
- 2
base/musl/musl.desc

@ -31,7 +31,7 @@
[L] MIT
[S] Stable
[V] 1.1.6
[V] 1.1.12
[P] O 01-------9 101.700
[D] 709114612 musl-1.1.6.tar.gz http://www.musl-libc.org/releases/
[D] 3093925564 musl-1.1.12.tar.gz http://www.musl-libc.org/releases/

+ 3
- 3
base/musl/parse-config-9

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/parse-config-9
# Copyright (C) 2012 - 2014 The OpenSDE Project
# Copyright (C) 2012 - 2015 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -168,8 +168,8 @@ if [ "$SDECFG_LIBC" == "musl" ]; then
case "$pkg" in
binutils)
hook_add postpatch 4 'musl_fix_addcases ./bfd/config.bfd ./bfd/configure \
./bfd/configure.in ./ld/configure.tgt'
hook_add postpatch 5 'musl_fix_addcases2 ./gas/configure ./gas/configure.in'
./ld/configure.tgt'
hook_add postpatch 5 'musl_fix_addcases2 ./gas/configure'
;;
gmp)
hook_add postpatch 6 'musl_fix_configsub configfsf.sub'

Loading…
Cancel
Save