commit:     359a3ca4124e1983a32cfa58ba6ba27018a150f9
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 21:04:47 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 21:04:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359a3ca4

net-fs/curlftpfs: fix build failure on musl, bug #716764

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/716764
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild           |  3 ++-
 net-fs/curlftpfs/files/curlftpfs-0.9.2-__off_t.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild 
b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
index f88478708ab..cb59baa5f70 100644
--- a/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
+++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,6 +27,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-0.9.2-memleak.patch
        "${FILESDIR}"/${PN}-0.9.2-memleak-nocache.patch
        "${FILESDIR}"/${PN}-0.9.2-fix-escaping.patch
+       "${FILESDIR}"/${PN}-0.9.2-__off_t.patch
 )
 
 src_prepare() {

diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-__off_t.patch 
b/net-fs/curlftpfs/files/curlftpfs-0.9.2-__off_t.patch
new file mode 100644
index 00000000000..796acf09155
--- /dev/null
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-__off_t.patch
@@ -0,0 +1,15 @@
+musl targetsdon't define __foo_t
+
+https://bugs.gentoo.org/716764
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,6 +22,9 @@ case $host_os in
+       darwin*)
+       CFLAGS="$CFLAGS -D__off_t=off_t"
+       ;;
++      *musl*)
++      CFLAGS="$CFLAGS -D__off_t=off_t"
++      ;;
+ esac
+ CFLAGS="$CFLAGS -Wall -W -Wno-sign-compare -D_REENTRANT $GLIB_CFLAGS 
$FUSE_CFLAGS $LIBCURL_CPPFLAGS"
+ LIBS="$GLIB_LIBS $FUSE_LIBS $LIBCURL"

Reply via email to