Merge pull request #268584 from otavio/fix-flashrom-stable (25dfdc28) · Commits · nix / nixpkgs

pkgs/by-name/li/libgpiod_1/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		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

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		{ 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;
		};
		}

+2 −9

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchgit
		, fetchurl
		, pkg-config
		, hidapi
		, libftdi1
		@@ -12,7 +11,7 @@
		, automake
		, texinfo
		, git
		, libgpiod
		, libgpiod_1
		}:

		stdenv.mkDerivation {
		@@ -42,13 +41,7 @@ stdenv.mkDerivation {
		]
		++
		# tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
		lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {
		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=";
		};
		}));
		lib.optional stdenv.isLinux libgpiod_1;

		configurePhase = ''
		SKIP_SUBMODULE=1 ./bootstrap

+2 −8

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		, jimtcl
		, libjaylink
		, libusb1
		, libgpiod
		, libgpiod_1

		, enableFtdi ? true, libftdi1

		@@ -27,13 +27,7 @@ stdenv.mkDerivation rec {
		buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ]
		++
		# tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
		lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {
		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=";
		};
		}));
		lib.optional stdenv.isLinux libgpiod_1;

		configureFlags = [
		"--disable-werror"

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		, installShellFiles
		, lib
		, libftdi1
		, libgpiod
		, libgpiod_1
		, libjaylink
		, libusb1
		, pciutils
		@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
		libjaylink
		libusb1
		] ++ lib.optionals (!stdenv.isDarwin) [
		libgpiod
		libgpiod_1
		pciutils
		];