Add libgpiod by amboar · Pull Request #130 · mesonbuild/wrapdb

amboar · 2021-08-12T03:04:15Z

The libgpiod library encapsulates the ioctl calls and data structures for accessing Linux's GPIO chardevs behind a straightforward API.

xclaesse · 2021-08-12T12:54:09Z

I should add in README/Doc that new wraps should specify if meson port has been proposed upstream first.

@amboar this is a non trivial meson port, has it been proposed upstream? If no, please do. If yes, please link to the discussion :)

amboar · 2021-08-13T02:28:02Z

@amboar this is a non trivial meson port, has it been proposed upstream? If no, please do. If yes, please link to the discussion :)

I've started the discussion upstream: https://lore.kernel.org/linux-gpio/cc4926af-95bb-4178-a760-d55821dfb626@www.fastmail.com/

amboar · 2021-08-13T03:56:24Z

@eli-schwartz regarding the docs, I'm going to leave manpages as a boolean option and keep the current behaviour of not installing the doxygen output. The Doxyfile.in is too antisocial in its current form; I tried various hacks with the doc subdirectory but couldn't get it working (output goes into build/doc rather than build/subprojects/libgpiod-1.6.3/doc, and then there's the "path element" issue with the output kwarg for custom_target().

Regarding the >=0.48.0 constraint, I'm using the .name() method of the build target object for the custom_target() output in the help2man case in order to name the man-page after the tool. .name() support was added in 0.54.0, and I don't think I can get rid of using without a lot of copy/paste.

eli-schwartz

On the doxygen issue, I see that Doxyfile.in specifies OUTPUT_DIRECTORY = doc so yeah, it will unfortunately build in whichever is the working directory of doxygen, and that does not play nicely with subprojects at all.

Given this, I don't believe you can enable the doxygen target at all, whether it gets installed or not. But if upstream makes that variable configurable, then this is solvable without patching Doxyfile.in

amboar · 2021-08-15T23:10:25Z

Given this, I don't believe you can enable the doxygen target at all, whether it gets installed or not.

Good point. I'll skip doxygen.

amboar · 2021-08-16T01:00:50Z

Okay, in the latest push:

Reduce meson version requirement to >=0.48.0
Only require a C++ compiler for -Dbindings=cxx
Compare and correct shared object versioning against autotools
Ensure all artefacts installed by upstream configure options are installed by meson configure options, including test artefacts (see discussion about test environment requirements on the kernel above)
Disable and warn for library documentation build due to incompatible Doxyfile from upstream

eli-schwartz · 2021-08-16T01:42:07Z

$ meson setup --wipe builddir . -Dwraps=libgpiod -Dlibgpiod:bindings=cxx,python
[...]
$ ninja -C builddir
[5/27] Compiling C++ object bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o
FAILED: bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o 
ccache c++ -Ibindings/cxx/examples/gpiodetectcxx.p -Ibindings/cxx/examples -I../bindings/cxx/examples -Ibindings/cxx -I../bindings/cxx -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -Wextra -std=gnu++11 -O2 -g -MD -MQ bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o -MF bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o.d -o bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o -c ../bindings/cxx/examples/gpiodetectcxx.cpp
In file included from ../bindings/cxx/examples/gpiodetectcxx.cpp:10:
../bindings/cxx/gpiod.hpp:13:10: fatal error: gpiod.h: No such file or directory
   13 | #include <gpiod.h>
      |          ^~~~~~~~~
compilation terminated.

I think you should be making much heavier use of the declare_dependencies() you have set up.

eli-schwartz · 2021-08-16T01:43:33Z

+             description: 'C++ bindings for libgpiod')
+
+gpiodcxx_dep = declare_dependency(link_with: gpiodcxx,
+                                  include_directories: gpiod_includes,


Should this also add the include_directories: gpiodcxx_includes ?

eli-schwartz · 2021-08-16T01:43:50Z

+gpiodcxx_sources = files('chip.cpp', 'iter.cpp', 'line.cpp', 'line_bulk.cpp')
+gpiodcxx_includes = include_directories('.')
+gpiodcxx = library('gpiodcxx', gpiodcxx_sources,
+                   include_directories: [ '.', gpiod_includes ],


'.' -> gpiodcxx_includes

eli-schwartz · 2021-08-16T01:44:49Z

+
+executable('gpiodetectcxx', 'gpiodetectcxx.cpp',
+           include_directories: '..',
+           link_with: gpiodcxx)


'.' -> gpiodcxx_includes

... or just dependencies: gpiodcxx_dep which is supposed to expose everything all together for you.

amboar · 2021-08-16T01:47:42Z

$ meson setup --wipe builddir . -Dwraps=libgpiod -Dlibgpiod:bindings=cxx,python
[...]
$ ninja -C builddir
[5/27] Compiling C++ object bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o
FAILED: bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o 
ccache c++ -Ibindings/cxx/examples/gpiodetectcxx.p -Ibindings/cxx/examples -I../bindings/cxx/examples -Ibindings/cxx -I../bindings/cxx -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -Wextra -std=gnu++11 -O2 -g -MD -MQ bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o -MF bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o.d -o bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o -c ../bindings/cxx/examples/gpiodetectcxx.cpp
In file included from ../bindings/cxx/examples/gpiodetectcxx.cpp:10:
../bindings/cxx/gpiod.hpp:13:10: fatal error: gpiod.h: No such file or directory
   13 | #include <gpiod.h>
      |          ^~~~~~~~~
compilation terminated.

Hmm, I wonder why I didn't see this in my testing.

I think you should be making much heavier use of the declare_dependencies() you have set up.

Yep.

eli-schwartz · 2021-08-16T01:50:27Z

The cxx bindings are disabled by default, so it felt like a useful thing to poke at to see if I can break it.

... look, my IRC nick isn't "elibrokeit" for nothing.

amboar · 2021-08-16T02:19:40Z

$ meson setup --wipe builddir . -Dwraps=libgpiod -Dlibgpiod:bindings=cxx,python
[...]
$ ninja -C builddir
[5/27] Compiling C++ object bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o
FAILED: bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o 
ccache c++ -Ibindings/cxx/examples/gpiodetectcxx.p -Ibindings/cxx/examples -I../bindings/cxx/examples -Ibindings/cxx -I../bindings/cxx -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -Wextra -std=gnu++11 -O2 -g -MD -MQ bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o -MF bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o.d -o bindings/cxx/examples/gpiodetectcxx.p/gpiodetectcxx.cpp.o -c ../bindings/cxx/examples/gpiodetectcxx.cpp
In file included from ../bindings/cxx/examples/gpiodetectcxx.cpp:10:
../bindings/cxx/gpiod.hpp:13:10: fatal error: gpiod.h: No such file or directory
   13 | #include <gpiod.h>
      |          ^~~~~~~~~
compilation terminated.

Hmm, I wonder why I didn't see this in my testing.

That would be because I had libgpiod-dev installed on my system 🤦

FWIW I was testing with meson setup -Dtools=true -Dtests=true -Dbindings=cxx,python -Dmanpages=true build in the subprojects/libgpiod-1.6.3 subdirectory, so was enabling the C++ bindings.

eli-schwartz · 2021-08-16T02:22:44Z

Yeah, I guess that would do it.

...

On the upstream note, looks like this will be a wrapdb exclusive for now?

amboar · 2021-08-16T02:24:55Z

On the upstream note, looks like this will be a wrapdb exclusive for now?

Yep, looking that way.

amboar · 2021-08-16T03:26:07Z

Okay, this time around:

Removed libgpiod-dev from my system, retested and fixed the broken includes
Refactored cumbersome use of link_with: / include_directories: kwargs by instead using dependencies: with existing results from declare_dependency()
Removed with_tests in favour of just inlining get_option('tests')
Renamed the manpages option to docs for forwards compatibility with generating other formats (e.g. html) whenever that becomes possible with the upstream Doxyfile

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

amboar · 2021-08-16T04:57:36Z

Fixed the include path issue in the c++ binding tests.

eli-schwartz requested changes Aug 12, 2021

View reviewed changes

amboar force-pushed the libgpiod branch from f947f68 to bf8fb96 Compare August 12, 2021 06:17

amboar requested a review from eli-schwartz August 12, 2021 06:18

eli-schwartz requested changes Aug 12, 2021

View reviewed changes

Comment thread subprojects/packagefiles/libgpiod/man/meson.build Outdated

amboar force-pushed the libgpiod branch from bf8fb96 to f1a8dbb Compare August 12, 2021 07:16

amboar requested a review from eli-schwartz August 12, 2021 07:23

amboar force-pushed the libgpiod branch from f1a8dbb to 8872bf4 Compare August 12, 2021 12:43

eli-schwartz requested changes Aug 12, 2021

View reviewed changes

Comment thread subprojects/packagefiles/libgpiod/lib/meson.build Outdated

amboar force-pushed the libgpiod branch from 8872bf4 to cd4ec40 Compare August 13, 2021 02:43

amboar requested a review from eli-schwartz August 13, 2021 02:56

eli-schwartz reviewed Aug 13, 2021

View reviewed changes

Comment thread subprojects/packagefiles/libgpiod/man/meson.build

eli-schwartz requested changes Aug 13, 2021

View reviewed changes

Comment thread subprojects/packagefiles/libgpiod/meson.build Outdated

amboar force-pushed the libgpiod branch from cd4ec40 to df5c209 Compare August 13, 2021 04:05

amboar requested a review from eli-schwartz August 13, 2021 04:05

eli-schwartz requested changes Aug 13, 2021

View reviewed changes

Comment thread subprojects/packagefiles/libgpiod/bindings/cxx/meson.build Outdated

Comment thread subprojects/packagefiles/libgpiod/man/meson.build Outdated

amboar force-pushed the libgpiod branch from df5c209 to 6a65437 Compare August 16, 2021 00:54

amboar requested a review from eli-schwartz August 16, 2021 00:54

eli-schwartz requested changes Aug 16, 2021

View reviewed changes

amboar force-pushed the libgpiod branch from 6a65437 to 157fcd2 Compare August 16, 2021 03:26

amboar requested a review from eli-schwartz August 16, 2021 03:31

eli-schwartz reviewed Aug 16, 2021

View reviewed changes

Comment thread subprojects/packagefiles/libgpiod/bindings/cxx/tests/meson.build Outdated

eli-schwartz reviewed Aug 16, 2021

View reviewed changes

Comment thread subprojects/packagefiles/libgpiod/bindings/cxx/tests/meson.build

Add libgpiod

3c2cdac

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

amboar force-pushed the libgpiod branch from 157fcd2 to 3c2cdac Compare August 16, 2021 04:55

eli-schwartz merged commit 6623079 into mesonbuild:master Aug 16, 2021

Conversation

amboar commented Aug 12, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xclaesse commented Aug 12, 2021

Uh oh!

Uh oh!

amboar commented Aug 13, 2021

Uh oh!

Uh oh!

Uh oh!

amboar commented Aug 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eli-schwartz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

amboar commented Aug 15, 2021

Uh oh!

amboar commented Aug 16, 2021

Uh oh!

eli-schwartz commented Aug 16, 2021

Uh oh!

eli-schwartz Aug 16, 2021

Choose a reason for hiding this comment

Uh oh!

eli-schwartz Aug 16, 2021

Choose a reason for hiding this comment

Uh oh!

eli-schwartz Aug 16, 2021

Choose a reason for hiding this comment

Uh oh!

amboar commented Aug 16, 2021

Uh oh!

eli-schwartz commented Aug 16, 2021

Uh oh!

amboar commented Aug 16, 2021

Uh oh!

eli-schwartz commented Aug 16, 2021

Uh oh!

amboar commented Aug 16, 2021

Uh oh!

amboar commented Aug 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

amboar commented Aug 16, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

amboar commented Aug 13, 2021 •

edited

Loading

amboar commented Aug 16, 2021 •

edited

Loading