Unverified Commit 1e48d84b authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

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

fuse-7z-ng: fix build against modern glibc
parents 3e2bc675 848f1e6b

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

+5 −0
Original line number Diff line number Diff line
@@ -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 ];

pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
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])