Merge pull request #200741 from trofi/fuse-7z-ng-zhf-fix
fuse-7z-ng: fix build against modern glibc
This commit is contained in:
commit
1e48d84b8c
|
@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
|
|||
rev = "eb5efb1f304c2b7bc2e0389ba06c9bf2ac4b932c";
|
||||
sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x";
|
||||
};
|
||||
patches = [
|
||||
# Drop unused pthread library. pthread_yield()
|
||||
# fails the configure.
|
||||
./no-pthread.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ];
|
||||
buildInputs = [ fuse ];
|
||||
|
|
11
pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch
Normal file
11
pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
pthread_yield() is not used by fuse-7z-ng, fails configure.
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -25,7 +25,6 @@ AC_CHECK_HEADERS([fcntl.h stddef.h string.h unistd.h dlfcn.h dirent.h])
|
||||
AC_CHECK_FUNCS([memset memmove])
|
||||
AC_CHECK_FUNCS([sqrt])
|
||||
|
||||
-AC_CHECK_LIB([pthread], [pthread_yield],,AC_MSG_ERROR([pthread library not found.]))
|
||||
AC_CHECK_LIB([dl], [dlclose])
|
||||
|
||||
PKG_CHECK_MODULES([fuse], [fuse >= 2.8])
|
Loading…
Reference in a new issue