Skip to contentSkip to conversation

libinput: drop C++ dependency

PATCH Superseded Peter Seiderer 2 participants 3 messages Jan 11, 2019 – Jan 12, 2019 Arm/Amlogic Meson SoC support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libinput: drop C++ dependency

The meson C++ dependency is only used for a build-time header include test, so drop both.

Fixes [1]:

The Meson build system
Version: 0.49.0
Source dir: .../build/libinput-1.12.5
Build dir: .../build/libinput-1.12.5/build
Build type: cross build
Project name: libinput
Project version: 1.12.5
Native C compiler: cc (gcc 4.8.4 "cc (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4") Cross C compiler: .../host/bin/riscv64-buildroot-linux-gnu-gcc (gcc 7.4.0)

meson.build:1:0: ERROR: Unknown compiler(s): [['.../host/bin/riscv64-buildroot-linux-gnu-g++']]
The follow exceptions were encountered:
Running ".../host/bin/riscv64-buildroot-linux-gnu-g++ --version" gave "[Errno 2] No such file or directory: '.../host/bin/riscv64-buildroot-linux-gnu-g++': '.../host/bin/riscv64-buildroot-linux-gnu-g++'"

[1] http://autobuild.buildroot.net/results/bf4d3d360f635c3524a52b84a72d558770596ed0

---
Note:
- alternative solution would be to add a c++ dependency for libinput
- patch could be improved to optional C++ dependency/compile (but did not know how to express this in meson)

---
 ...0001-meson.build-drop-CPP-dependency.patch | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 package/libinput/0001-meson.build-drop-CPP-dependency.patch
package/libinput/0001-meson.build-drop-CPP-dependency.patch new file +39 -0
new file mode 100644
index 0000000000..0a737f55ea
@@ -0,0 +1,39 @@
+From bdc1c4a707cfa47933d06d74b9b581c15dad98f8 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <[email protected]>
+Date: Fri, 11 Jan 2019 23:34:37 +0100
+Subject: [PATCH] meson.build: drop CPP dependency
+
+Drop meson C++/CPP dependency, only needed for the build-time
+header inclusion test, so drop both.
+
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ meson.build | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a9c7c185..9456a98e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,4 +1,4 @@
+-project('libinput', 'c', 'cpp',
++project('libinput', 'c',
+ 	version : '1.12.5',
+ 	license : 'MIT/Expat',
+ 	default_options : [ 'c_std=gnu99', 'warning_level=2' ],
+@@ -641,12 +641,6 @@ executable('test-build-linker',
+ 	   include_directories : [includes_src, includes_include],
+ 	   dependencies : [ dep_libinput, dep_libinput_util ],
+ 	   install : false)
+-# test including from C++
+-executable('test-build-cxx',
+-	   'test/build-cxx.cc',
+-	   dependencies : [dep_udev],
+-	   include_directories : [includes_src, includes_include],
+-	   install : false)
+ 
+ # This is the test suite runner, we allow disabling that one because of
+ # dependencies
+-- 
+2.20.1
+
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 libinput: drop C++ dependency

Peter, All,

On 2019-01-12 00:01 +0100, Peter Seiderer spake thusly:

Quoted 2 lines

The meson C++ dependency is only used for a build-time header include test, so drop both.

[--SNIP--]

Quoted 8 lines

[1] http://autobuild.buildroot.net/results/bf4d3d360f635c3524a52b84a72d558770596ed0

---
Note:
- alternative solution would be to add a c++ dependency for libinput
- patch could be improved to optional C++ dependency/compile (but did not know how to express this in meson)

[--SNIP--]

package/libinput/0001-meson.build-drop-CPP-dependency.patch line 33

Quoted 10 lines

+@@ -641,12 +641,6 @@ executable('test-build-linker',

package/libinput/0001-meson.build-drop-CPP-dependency.patch new file +9 -0
+ 	   include_directories : [includes_src, includes_include],
+ 	   dependencies : [ dep_libinput, dep_libinput_util ],
+ 	   install : false)
+-# test including from C++
+-executable('test-build-cxx',
+-	   'test/build-cxx.cc',
+-	   dependencies : [dep_udev],
+-	   include_directories : [includes_src, includes_include],
+-	   install : false)

You may want to test something like that:

if add_languages('cpp')
executable('test-build-cxx',
blablabla)
endif

If that works, then I think I'd prefer we use this patch, because it is upstreamable, which you should try to do btw.

Regards,
Yann E. MORIN.

Quoted 8 lines

+ # This is the test suite runner, we allow disabling that one because of
+ # dependencies
+--
+2.20.1
+

Signature · 1 line
2.20.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 libinput: drop C++ dependency

Hello Yann,

Quoted 26 lines · Yann E. MORIN

Peter, All,

On 2019-01-12 00:01 +0100, Peter Seiderer spake thusly:

Quoted 2 lines

The meson C++ dependency is only used for a build-time header include test, so drop both.

[--SNIP--]

Quoted 8 lines

[1] http://autobuild.buildroot.net/results/bf4d3d360f6Drop hard meson C++/CPP dependency35c3524a52b84a72d558770596ed0

---
Note:
- alternative solution would be to add a c++ dependency for libinput
- patch could be improved to optional C++ dependency/compile (but did not know how to express this in meson)

[--SNIP--]

package/libinput/0001-meson.build-drop-CPP-dependency.patch line 33

Quoted 10 lines

+@@ -641,12 +641,6 @@ executable('test-build-linker',

package/libinput/0001-meson.build-drop-CPP-dependency.patch new file +9 -0
+ 	   include_directories : [includes_src, includes_include],
+ 	   dependencies : [ dep_libinput, dep_libinput_util ],
+ 	   install : false)
+-# test including from C++
+-executable('test-build-cxx',
+-	   'test/build-cxx.cc',
+-	   dependencies : [dep_udev],
+-	   include_directories : [includes_src, includes_include],
+-	   install : false)  
Quoted 6 lines

You may want to test something like that:

if add_languages('cpp')
executable('test-build-cxx',
blablabla)
endif

Thanks for the hint, works with:

if add_languages('cpp', required: false)

Updated patch is on the way....

Regards,
Peter

Quoted 16 lines

If that works, then I think I'd prefer we use this patch, because it is upstreamable, which you should try to do btw.

Regards,
Yann E. MORIN.

Quoted 8 lines

+ # This is the test suite runner, we allow disabling that one because of
+ # dependencies
+--
+2.20.1
+

Signature · 1 line
2.20.1