git.iko.soy/typeable/nixpkgs
on master help sign in
fuse,fuse3: Avoid unnecessary build warnings

Do not set FUSERMOUNT_DIR since we already set it though NIX_CFLAGS_COMPILE. Setting it twice results in a lot of warnings like this one: <command-line>:0:0: warning: "FUSERMOUNT_DIR" redefined which makes the build look potentially broken. This doesn't affect the result but fuse3 will now build without any warnings and building fuse yields less warnings.

commitf2cfc158b2ae0c31950eb1d3142fdd723887bc35 authorMichael Weiss <dev.primeos@gmail.com> dateFri 14 Jun 2019, 18:23 (7 years ago) parent189c4de
3 files changed+26−1
pkgs/os-specific/linux/fuse/common.nix+3−1 pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch+11 pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch+12
pkgs/os-specific/linux/fuse/common.nix+3−1
@@ -28,7 +28,9 @@ in stdenv.mkDerivation rec {
2828 url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
2929 sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
3030 })
31− ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
31+ ++ (if isFuse3
32+ then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ]
33+ else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]);
3234
3335 nativeBuildInputs = if isFuse3
3436 then [ meson ninja pkgconfig ]
pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patchnew file+11
@@ -0,0 +1,11 @@
1+--- a/lib/Makefile.am
2++++ b/lib/Makefile.am
3+@@ -1,7 +1,7 @@
4+ ## Process this file with automake to produce Makefile.in
5+
6+ AUTOMAKE_OPTIONS = subdir-objects
7+-AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \
8++AM_CPPFLAGS = -I$(top_srcdir)/include \
9+ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26
10+
11+ lib_LTLIBRARIES = libfuse.la libulockmgr.la
pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patchnew file+12
@@ -0,0 +1,12 @@
1+--- a/lib/meson.build
2++++ b/lib/meson.build
3+@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
4+ soversion: '3', include_directories: include_dirs,
5+ dependencies: deps, install: true,
6+ link_depends: 'fuse_versionscript',
7+- c_args: [ '-DFUSE_USE_VERSION=34',
8+- '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
9++ c_args: [ '-DFUSE_USE_VERSION=34' ],
10+ link_args: ['-Wl,--version-script,' + meson.current_source_dir()
11+ + '/fuse_versionscript' ])
12+