libgpiod_1: restore 1.6.4 version

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador 2023-11-19 23:27:20 -03:00
parent 6104170b8c
commit 12c0a5cab9
2 changed files with 76 additions and 0 deletions

View file

@ -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

View file

@ -0,0 +1,45 @@
{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod
, enable-tools ? true
, enablePython ? false, python3, ncurses }:
stdenv.mkDerivation rec {
pname = "libgpiod";
version = "1.6.4";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
};
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
pkg-config
autoreconfHook
];
configureFlags = [
"--enable-tools=${if enable-tools then "yes" else "no"}"
"--enable-bindings-cxx"
"--prefix=${placeholder "out"}"
] ++ lib.optional enablePython "--enable-bindings-python";
meta = with lib; {
description = "C library and tools for interacting with the linux GPIO character device";
longDescription = ''
Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
the character device instead. This library encapsulates the ioctl calls and
data structures behind a straightforward API.
'';
homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";
license = licenses.lgpl2;
maintainers = [ maintainers.expipiplus1 ];
platforms = platforms.linux;
};
}