diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-11-05 06:23:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 06:23:40 +0100 |
| commit | 169131389b2007d98d66a272df734c4a07f0ae15 (patch) | |
| tree | ae80c15e1912657390b13424378607d80a61e196 /pkgs/development/libraries/libgpiod | |
| parent | f7dd7e86cbca99ede404b9c38a3a45410cbec34f (diff) | |
| parent | b920bf3d618cb7e0e9b29db9774274b12b75a974 (diff) | |
| download | nixpkgs-169131389b2007d98d66a272df734c4a07f0ae15.tar nixpkgs-169131389b2007d98d66a272df734c4a07f0ae15.tar.gz nixpkgs-169131389b2007d98d66a272df734c4a07f0ae15.tar.bz2 nixpkgs-169131389b2007d98d66a272df734c4a07f0ae15.tar.lz nixpkgs-169131389b2007d98d66a272df734c4a07f0ae15.tar.xz nixpkgs-169131389b2007d98d66a272df734c4a07f0ae15.tar.zst nixpkgs-169131389b2007d98d66a272df734c4a07f0ae15.zip | |
Merge pull request #86645 from sorki/cross_libgpiod
libgpiod: add patch fixing cross-compilation
Diffstat (limited to 'pkgs/development/libraries/libgpiod')
| -rw-r--r-- | pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch | 31 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgpiod/default.nix | 6 |
2 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch new file mode 100644 index 00000000000..f2ee8e8d3d7 --- /dev/null +++ b/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch @@ -0,0 +1,31 @@ +From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001 +From: Johannes Lode <johannes.lode@dynainstruments.com> +Date: Thu, 14 Nov 2019 10:44:00 +0100 +Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as + regular functions. + +While cross-compiling there occurred "undefined reference to +`rpl_malloc'", the suggested change fixes the problem. + +Tested for native X86_64 and armv7a-unknown-linux-gnueabihf. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 008499d..b492dc4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX], + + # This is always checked (library needs this) + AC_HEADER_STDC +-AC_FUNC_MALLOC ++# AC_FUNC_MALLOC -- does not work while cross-compiling ++AC_CHECK_FUNC([malloc realloc]) + AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])]) + AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) + AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) +-- +2.25.1 + diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 25eb4290e51..23ef2c067a6 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5"; }; + patches = [ + # cross compiling fix + # https://github.com/brgl/libgpiod/pull/45 + ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch + ]; + buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive |