JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #200741 from trofi/fuse-7z-ng-zhf-fix

Browse Source 
fuse-7z-ng: fix build against modern glibc
This commit is contained in:
Sergei Trofimovich 2022-11-11 22:27:58 +00:00 committed by GitHub
commit 1e48d84b8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/filesystems/fuse-7z-ng/default.nix
View File

@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
rev = "eb5efb1f304c2b7bc2e0389ba06c9bf2ac4b932c"; rev = "eb5efb1f304c2b7bc2e0389ba06c9bf2ac4b932c";
sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x";
}; };
patches = [
# Drop unused pthread library. pthread_yield()
# fails the configure.
./no-pthread.patch
];
nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ]; nativeBuildInputs = [ pkg-config makeWrapper autoconf automake ];
buildInputs = [ fuse ]; buildInputs = [ fuse ];

11
pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch Normal file
View 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])