summaryrefslogtreecommitdiff
path: root/dev-libs/libgpiod
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-23 07:01:01 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-23 07:01:01 +0000
commit2c9b8fbe41c04a94054b0540b54fcf2de0b79166 (patch)
treee83313a8db0bba5ca6d288977a45bbdf0dea81c9 /dev-libs/libgpiod
parent6c169675dd21d25ad82ab0560f3d5b1e714219b6 (diff)
gentoo auto-resync : 23:03:2024 - 07:01:01
Diffstat (limited to 'dev-libs/libgpiod')
-rw-r--r--dev-libs/libgpiod/Manifest7
-rw-r--r--dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch66
-rw-r--r--dev-libs/libgpiod/libgpiod-2.1.1.ebuild (renamed from dev-libs/libgpiod/libgpiod-2.0.2.ebuild)15
-rw-r--r--dev-libs/libgpiod/libgpiod-2.1.ebuild14
4 files changed, 95 insertions, 7 deletions
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 529c88f441f1..b3105d1c91a7 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,9 +1,10 @@
+AUX libgpiod-2.1-libtool.patch 2722 BLAKE2B 35f41e534dfd27f7f0c42a1cf0dcf1350483ff6bf656feb51a64a58640f83153faddcd1169cad9ef722ace9621c1634c122971a8998b60f474235829dc321a41 SHA512 1a984470f1eca5ce7da162bce5f0040084ddd4a4de2efb970218944cd03675e51cf833063f0f151d796569b3f9e87843bbb6c04902fa99349284baf21aa9cef6
DIST libgpiod-1.6.3.tar.xz 326068 BLAKE2B eda5409f2db3914ede92690589643211eca3002f8dc53a7c48213602f28158084c8eb8061319923f7a51c7d91650ff58b81b059323b5b9133a28b0bb04f6904d SHA512 f7e48662d02904f3f25976d61aa2cf4af0b8a52f65f184f23dfb6916bde9b86634b211f2696d3459a4f902ba5a79621b2fc47d18d487fd7a159018fe8933e370
DIST libgpiod-1.6.4.tar.xz 334552 BLAKE2B 3bf52dab263638967e0f59c858e22f3d8ec1c9565ba1edd665dff580a883fbc6aa49a944e6df4da8fca9c2df873e222ed4e055c9792ee27d4562b3c2d0c65b79 SHA512 23ea27147039ae34505263dbfbb3ca9985fc671d26e489ccaf150543d4e853f709393f46a8a5a1e682fa91378163bd2db6c689159ef73c3a8d1eeea422eacda0
-DIST libgpiod-2.0.2.tar.xz 408672 BLAKE2B aa63edc12ad4a473dcf753160d4c6d8b1ebe7b99afe6fa60b968975e10f943d57bd75ff039732d3c26be6ff5e044ce8e0638ea3e21625e4d298b6005bf442a3a SHA512 3e92fe8b52da20abc89dd857a10f0e7fef77663a7a6cbcd7471f49843d54e9a053fa150a3f5b200f220a1a40c2ded010c271deba796fbc0775010d980a7083f1
+DIST libgpiod-2.1.1.tar.xz 421164 BLAKE2B 940f2af832a0fc39accecd9cf76864d05f961c0d2e4899d09dc07670bb2a8d8c2704fa43e29e2163f2b486ba65cadce2114f96cf0e7637afece99c543852305f SHA512 d396f1b8f632c3592b2be37e23e5052f4050ab5c1a9de77de5f97ce50fa3115c119dd69b0bbcf59621e92b775bfc81f18a65cca1e57e022752d28c0e01baff6f
DIST libgpiod-2.1.tar.xz 421132 BLAKE2B 97f43854070f19b37f4041c08d33c8156d69a3acd73845849f843223d159602ad8aa59096e1c8a3428bf16488272353a5747c6c95b9f729cb11e53ceeb6b29c2 SHA512 1c20a93fb2a6cf66f4690a5784ac1aeb077ca3da23c1942448f045972092468480e13b13174f327b3b7252bef5f23ffd226c990f11529b1151ba2dc318a47e52
EBUILD libgpiod-1.6.3-r4.ebuild 1175 BLAKE2B 923b428c143c3640f71a66f1ecde97a49c6633437f445b19a83e40138e21147a4a653eeeefbe375ede291a1736823fa7b3bfeb5eae81961e7a8006add6db0336 SHA512 5ec466695703f6a6c2bc2a7bd852cbcace62e37b4dbe6dc7fc7897f483f7b77123bede6f8cea95dcc61a68a4a894ead137bfbf7c692b31386b21f16ca2e64ae3
EBUILD libgpiod-1.6.4.ebuild 1179 BLAKE2B b17f3ab9ae5c3880edd03cc0fe4da74fc03cb0d032bb1a072bcedbb65427ac6a15d7dd81756d451ee190b648c5e2d8bc7383eca58a0328a52da44c743192bc2a SHA512 110908ffd82bd2569cb4020346f09f7931fcc6479e5ad91208de2fd43fd4df45f0880d347f72caeae45823d54e558cf23f88353d4309954794c6c58f86ca7284
-EBUILD libgpiod-2.0.2.ebuild 1273 BLAKE2B 867f4f8381848f9cd1b9e092356f9bf9d59c6f6bac78a159209ac5365a9d630214ef1f78e517daffd341e100b3c94c1321ced9b0e15fd1ad6eed70a945919a8b SHA512 bd3a74a7733b3967820dd7ffc2353ecc7ef12df700f9da20f40de9c0286393acab5fb1ff2e7237d3e8ac85f6e609428216a13413bccadad4db7ebfcdc754d81d
-EBUILD libgpiod-2.1.ebuild 1273 BLAKE2B 867f4f8381848f9cd1b9e092356f9bf9d59c6f6bac78a159209ac5365a9d630214ef1f78e517daffd341e100b3c94c1321ced9b0e15fd1ad6eed70a945919a8b SHA512 bd3a74a7733b3967820dd7ffc2353ecc7ef12df700f9da20f40de9c0286393acab5fb1ff2e7237d3e8ac85f6e609428216a13413bccadad4db7ebfcdc754d81d
+EBUILD libgpiod-2.1.1.ebuild 1422 BLAKE2B ba1fc80b9b8681fd1b9eabad0b1781ad576c218831594d74c73592dfa35cfb66f2e8b7358e7312f35573bce1cbbc2232572d6ca4ae6290389ef2c0c7f7a4b8db SHA512 ba20b373159e3c94125c1003c28cb2f538217c7f2e3c5fde30a6446c92b9c67ebec532cb14128f6ae28b9511f00f377b232b4dbdfe9c17bc17a10d112fc450b4
+EBUILD libgpiod-2.1.ebuild 1390 BLAKE2B 743975ee2b223cda564f4fb3e060f689d96f45c56e7b577e607e738e49cfd9e225e602388896fdb5ca382b4a509aeadf69bbf7e62ebd5463bc1650886de81853 SHA512 6fed11b64b96d623d668e0a446184e921945bc7d1132f925e6bdeaf676f8011d2818e39623be6d37a9e0fb2954c8ee286c634b2a76f80bb54d805b06fa4b7920
MISC metadata.xml 332 BLAKE2B 14e5a292a2b590adc7cb643ba4c58b997e5573719383e4b4f58583f992ebff4fbb1455c9a2e71665f739c112c9eb8311879f545f5b770d57d176d013e08e103d SHA512 45f341d7b87c774730451fb583b03347efe2f69188a38c8ad9690cf690d96d65c3d85c42c0b1d80e5a0a63ea749df879b2b71b7f44d124afeaeeb628e2fbec05
diff --git a/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch b/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch
new file mode 100644
index 000000000000..efab5084ec8e
--- /dev/null
+++ b/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch
@@ -0,0 +1,66 @@
+From b10af6b0173e647b54834edff087a5811b6bcfe1 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Mar 2024 06:49:57 -0700
+Subject: [PATCH] bindings: cxx: link using the libtool archives
+
+When linking with internal dependencies that were built with libtool the
+most reliable method is to use the libtool archive (.la) files.
+
+When building with slibtool it fails when it doesn't find the -lgpiod
+linker flag, but if libgpiod is already installed to the system it will
+be built using the system version instead of the newly built libraries.
+
+Link: https://bugs.gentoo.org/913899
+Signed-off-by: orbea <orbea@riseup.net>
+[Bartosz: fix a typo in tests Makefile]
+Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+---
+ bindings/cxx/Makefile.am | 2 +-
+ bindings/cxx/examples/Makefile.am | 2 +-
+ bindings/cxx/tests/Makefile.am | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am
+index 1eafaa2c..e2a89cf4 100644
+--- a/bindings/cxx/Makefile.am
++++ b/bindings/cxx/Makefile.am
+@@ -24,8 +24,8 @@ libgpiodcxx_la_CXXFLAGS = -Wall -Wextra -g -std=gnu++17
+ libgpiodcxx_la_CXXFLAGS += -fvisibility=hidden -I$(top_srcdir)/include/
+ libgpiodcxx_la_CXXFLAGS += $(PROFILING_CFLAGS)
+ libgpiodcxx_la_LDFLAGS = -version-info $(subst .,:,$(ABI_CXX_VERSION))
+-libgpiodcxx_la_LDFLAGS += -lgpiod -L$(top_builddir)/lib
+ libgpiodcxx_la_LDFLAGS += $(PROFILING_LDFLAGS)
++libgpiodcxx_la_LIBADD = $(top_builddir)/lib/libgpiod.la
+
+ include_HEADERS = gpiod.hpp
+
+diff --git a/bindings/cxx/examples/Makefile.am b/bindings/cxx/examples/Makefile.am
+index 64ced200..eca4d64a 100644
+--- a/bindings/cxx/examples/Makefile.am
++++ b/bindings/cxx/examples/Makefile.am
+@@ -3,7 +3,7 @@
+
+ AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
+ AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17
+-AM_LDFLAGS = -lgpiodcxx -L$(top_builddir)/bindings/cxx/
++LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la
+
+ noinst_PROGRAMS = \
+ async_watch_line_value \
+diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am
+index 02b5b6de..fbf80a10 100644
+--- a/bindings/cxx/tests/Makefile.am
++++ b/bindings/cxx/tests/Makefile.am
+@@ -4,9 +4,9 @@
+ AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
+ AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/
+ AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS)
+-AM_LDFLAGS = -lgpiodcxx -L$(top_builddir)/bindings/cxx/
+-AM_LDFLAGS += -lgpiosim -L$(top_builddir)/tests/gpiosim/
+-AM_LDFLAGS += -pthread
++AM_LDFLAGS = -pthread
++LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la
++LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la
+
+ noinst_PROGRAMS = gpiod-cxx-test
+
diff --git a/dev-libs/libgpiod/libgpiod-2.0.2.ebuild b/dev-libs/libgpiod/libgpiod-2.1.1.ebuild
index 94df11b5ec4b..f9552379a641 100644
--- a/dev-libs/libgpiod/libgpiod-2.0.2.ebuild
+++ b/dev-libs/libgpiod/libgpiod-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit linux-info
+inherit autotools linux-info
DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
@@ -26,14 +26,25 @@ DEPEND="
>=sys-apps/kmod-18
>=sys-apps/util-linux-2.33.1
>=virtual/libudev-215
+ cxx? ( <dev-cpp/catch-3.5:0 )
)
"
+PATCHES=(
+ # bug 913899
+ "${FILESDIR}"/${PN}-2.1-libtool.patch
+)
+
pkg_setup() {
CONFIG_CHECK="~GPIO_CDEV_V1"
linux-info_pkg_setup
}
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myconf=(
$(use_enable tools)
diff --git a/dev-libs/libgpiod/libgpiod-2.1.ebuild b/dev-libs/libgpiod/libgpiod-2.1.ebuild
index 94df11b5ec4b..d3c115ebeb62 100644
--- a/dev-libs/libgpiod/libgpiod-2.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit linux-info
+inherit autotools linux-info
DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
@@ -29,11 +29,21 @@ DEPEND="
)
"
+PATCHES=(
+ # bug 913899
+ "${FILESDIR}"/${PN}-2.1-libtool.patch
+)
+
pkg_setup() {
CONFIG_CHECK="~GPIO_CDEV_V1"
linux-info_pkg_setup
}
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myconf=(
$(use_enable tools)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 05:24:52 +0000