From 5739e62cfdaa148eabcc5899741a1a31e763f81d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 25 Dec 2022 10:21:46 +0100 Subject: [PATCH] hidapi, remove static library, fix build (#7638) --- dev-libs/hidapi/hidapi-0.10.1.recipe | 6 ++++-- .../hidapi/patches/hidapi-0.10.1.patchset | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 dev-libs/hidapi/patches/hidapi-0.10.1.patchset diff --git a/dev-libs/hidapi/hidapi-0.10.1.recipe b/dev-libs/hidapi/hidapi-0.10.1.recipe index c435b6180..d571a5885 100644 --- a/dev-libs/hidapi/hidapi-0.10.1.recipe +++ b/dev-libs/hidapi/hidapi-0.10.1.recipe @@ -13,10 +13,11 @@ COPYRIGHT="2010 Alan Ott 2019-2020 libusb/hidapi Team" LICENSE="BSD (3-clause) GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/libusb/hidapi/archive/refs/tags/hidapi-$portVersion.tar.gz" CHECKSUM_SHA256="f71dd8a1f46979c17ee521bc2117573872bbf040f8a4750e492271fc141f2644" SOURCE_DIR="hidapi-hidapi-$portVersion" +PATCHES="hidapi-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -61,7 +62,8 @@ BUILD() runConfigure ./configure \ --disable-dependency-tracking \ - --with-gnu-ld + --with-gnu-ld \ + --disable-static make $jobArgs } diff --git a/dev-libs/hidapi/patches/hidapi-0.10.1.patchset b/dev-libs/hidapi/patches/hidapi-0.10.1.patchset new file mode 100644 index 000000000..497dd1835 --- /dev/null +++ b/dev-libs/hidapi/patches/hidapi-0.10.1.patchset @@ -0,0 +1,21 @@ +From bf4cd594c3ceedc1800bb68156228b060f90e383 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 25 Dec 2022 10:08:15 +0100 +Subject: Build fix from upstream + + +diff --git a/configure.ac b/configure.ac +index 220909a..77da67a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" + + AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([foreign -Wall -Werror]) +-AC_CONFIG_MACRO_DIR([m4]) + + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + LT_INIT +-- +2.37.3 +