ecryptfs-tools: unbreak musl

This commit is contained in:
jbu 2015-08-07 15:28:18 +02:00
parent 295451615e
commit e30d13ea88
3 changed files with 34 additions and 5 deletions

View file

@ -0,0 +1,10 @@
--- src/utils/mount.ecryptfs_private.c 2015-02-10 17:59:34.000000000 +0100
+++ src/utils/mount.ecryptfs_private.c 2015-08-07 15:21:39.847867532 +0200
@@ -32,6 +32,7 @@
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
+#include <fcntl.h>
#include <keyutils.h>
#include <mntent.h>
#include <pwd.h>

View file

@ -0,0 +1,23 @@
The types uid_t and gid_t are defined in <unistd.h>, which
isn't included as a side effect with musl libc.
--- src/utils/io.c 2015-02-10 17:59:34.000000000 +0100
+++ src/utils/io.c 2015-08-07 15:07:56.127793677 +0200
@@ -26,6 +26,7 @@
#include <string.h>
#include <termios.h>
#include <stdlib.h>
+#include <unistd.h>
#include <errno.h>
#include <sys/mman.h>
#include "ecryptfs.h"
--- src/utils/mount.ecryptfs.c 2015-03-10 17:45:52.000000000 +0100
+++ src/utils/mount.ecryptfs.c 2015-08-07 15:15:28.411834229 +0200
@@ -23,6 +23,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <unistd.h>
#include <getopt.h>
#include <keyutils.h>
#include <stdio.h>

View file

@ -1,7 +1,7 @@
# Template file for 'ecryptfs-utils'
pkgname=ecryptfs-utils
version=106
revision=4
revision=5
lib32disabled=yes
build_style=gnu-configure
configure_args="--sbindir=/usr/bin
@ -16,10 +16,6 @@ homepage="http://ecryptfs.org/"
distfiles="http://launchpad.net/ecryptfs/trunk/${version}/+download/${pkgname}_${version}.orig.tar.gz"
checksum=173e0add31e898789076103723894964ce474233988ef8d3309021bad8a7b6b4
case "$XBPS_TARGET_MACHINE" in
*-musl) broken="http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/3578/steps/shell_3/logs/stdio";;
esac
CPPFLAGS="-D_FILE_OFFSET_BITS=64"
if [ "$CROSS_BUILD" ]; then