diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-08-28 12:00:19 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-28 12:00:19 +0100 |
| commit | 7166f3a0a0b7886d340010458d0b130013cb9989 (patch) | |
| tree | 3ff502007dde9dba943a004a3bf201ae4e0787bd /dev-libs/libgpiod | |
| parent | 345c02ca33341652116ddec6705530223af2de85 (diff) | |
gentoo auto-resync : 28:08:2024 - 12:00:19
Diffstat (limited to 'dev-libs/libgpiod')
| -rw-r--r-- | dev-libs/libgpiod/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch | 66 |
2 files changed, 0 insertions, 67 deletions
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest index 78d33213e215..a3a414c7a31b 100644 --- a/dev-libs/libgpiod/Manifest +++ b/dev-libs/libgpiod/Manifest @@ -1,4 +1,3 @@ -AUX libgpiod-2.1-libtool.patch 2722 BLAKE2B 35f41e534dfd27f7f0c42a1cf0dcf1350483ff6bf656feb51a64a58640f83153faddcd1169cad9ef722ace9621c1634c122971a8998b60f474235829dc321a41 SHA512 1a984470f1eca5ce7da162bce5f0040084ddd4a4de2efb970218944cd03675e51cf833063f0f151d796569b3f9e87843bbb6c04902fa99349284baf21aa9cef6 DIST libgpiod-1.6.4.tar.xz 334552 BLAKE2B 3bf52dab263638967e0f59c858e22f3d8ec1c9565ba1edd665dff580a883fbc6aa49a944e6df4da8fca9c2df873e222ed4e055c9792ee27d4562b3c2d0c65b79 SHA512 23ea27147039ae34505263dbfbb3ca9985fc671d26e489ccaf150543d4e853f709393f46a8a5a1e682fa91378163bd2db6c689159ef73c3a8d1eeea422eacda0 DIST libgpiod-2.1.2.tar.xz 419964 BLAKE2B 62b1df3af28d0ab4988101f6bcbce750fd5bd7db874a34c196630bc8badaefc8e3c5c60bbf3c4dfff074d4d2f681d3339fc32c9eeecf395b595b91e5727572e5 SHA512 e921ac34692d5ae92a29592e2103229a8b0afcdcfa750e30fbd292554cd2e59fd51aefc8fa2ad1c9ad5ea4a93bb3443e8f6e8f4f1537109b263aba33317106f3 DIST libgpiod-2.1.3.tar.xz 420048 BLAKE2B a012720dc3569fa80f990303a9fdc2552bf9661ff98871c9062e76d46db0b1f8d819c2941d8325baea377d12b562aeec25e1d5c814183646f09ef93e67052c4f SHA512 a617a25b9b3b59edb45a6bcc59321c369f5d7f09d33edcf0be5ea39fbc0396f6c1e29b32eac1cefba85de5c92c9b7c198f4598b6a666970c8df11e7ce4358ff4 diff --git a/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch b/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch deleted file mode 100644 index efab5084ec8e..000000000000 --- a/dev-libs/libgpiod/files/libgpiod-2.1-libtool.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 - |