Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

f2fs-tools: fix cross compilation

eburimu d8e73253 dc8aca44

+29
+2
pkgs/tools/filesystems/f2fs-tools/default.nix
··· 13 nativeBuildInputs = [ autoreconfHook pkgconfig ]; 14 buildInputs = [ libselinux libuuid ]; 15 16 meta = with stdenv.lib; { 17 homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; 18 description = "Userland tools for the f2fs filesystem";
··· 13 nativeBuildInputs = [ autoreconfHook pkgconfig ]; 14 buildInputs = [ libselinux libuuid ]; 15 16 + patches = [ ./f2fs-tools-cross-fix.patch ]; 17 + 18 meta = with stdenv.lib; { 19 homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; 20 description = "Userland tools for the f2fs filesystem";
+27
pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
···
··· 1 + --- f2fs-tools/configure.ac.orig 2018-11-29 05:05:57.154988687 +0300 2 + +++ f2fs-tools/configure.ac 2018-11-29 05:06:12.667316101 +0300 3 + @@ -20,14 +20,16 @@ 4 + [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), 5 + [Minor version for f2fs-tools]) 6 + 7 + -AC_CHECK_FILE(.git, 8 + - AC_DEFINE([F2FS_TOOLS_DATE], 9 + - "m4_bpatsubst(f2fs_tools_gitdate, 10 + - [\([0-9-]*\)\(\w\|\W\)*], [\1])", 11 + - [f2fs-tools date based on Git commits]), 12 + - AC_DEFINE([F2FS_TOOLS_DATE], 13 + - "f2fs_tools_date", 14 + - [f2fs-tools date based on Source releases])) 15 + +dnl AC_CHECK_FILE(.git, 16 + +dnl AC_DEFINE([F2FS_TOOLS_DATE], 17 + +dnl "m4_bpatsubst(f2fs_tools_gitdate, 18 + +dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", 19 + +dnl [f2fs-tools date based on Git commits]), 20 + +dnl AC_DEFINE([F2FS_TOOLS_DATE], 21 + +dnl "f2fs_tools_date", 22 + +dnl [f2fs-tools date based on Source releases])) 23 + + 24 + +AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases]) 25 + 26 + AC_CONFIG_SRCDIR([config.h.in]) 27 + AC_CONFIG_HEADER([config.h])