alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #51204 from eburimu/fix/cross-f2fs-tools

Browse source 
f2fs-tools: fix cross compilation
This commit is contained in:
John Ericson 2018-11-29 15:26:27 -05:00 committed by GitHub
parent ed71691a81 d8e73253a4
commit 071eba26a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/filesystems/f2fs-tools/default.nix
View file

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libselinux libuuid ]; buildInputs = [ libselinux libuuid ];
patches = [ ./f2fs-tools-cross-fix.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/;
description = "Userland tools for the f2fs filesystem"; description = "Userland tools for the f2fs filesystem";

27
pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch Normal file
View file

@ -0,0 +1,27 @@
--- f2fs-tools/configure.ac.orig 2018-11-29 05:05:57.154988687 +0300
+++ f2fs-tools/configure.ac 2018-11-29 05:06:12.667316101 +0300
@@ -20,14 +20,16 @@
[\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
[Minor version for f2fs-tools])
-AC_CHECK_FILE(.git,
- AC_DEFINE([F2FS_TOOLS_DATE],
- "m4_bpatsubst(f2fs_tools_gitdate,
- [\([0-9-]*\)\(\w\|\W\)*], [\1])",
- [f2fs-tools date based on Git commits]),
- AC_DEFINE([F2FS_TOOLS_DATE],
- "f2fs_tools_date",
- [f2fs-tools date based on Source releases]))
+dnl AC_CHECK_FILE(.git,
+dnl AC_DEFINE([F2FS_TOOLS_DATE],
+dnl "m4_bpatsubst(f2fs_tools_gitdate,
+dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])",
+dnl [f2fs-tools date based on Git commits]),
+dnl AC_DEFINE([F2FS_TOOLS_DATE],
+dnl "f2fs_tools_date",
+dnl [f2fs-tools date based on Source releases]))
+
+AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])