commit e0aad338b70ae2f986f9df6b7bc5de50e44fa4d4
parent 80f02cd1edfdf4b2eda9bfb98edc4ad8aab20903
Author: Michael Heimpold <mhei@heimpold.de>
Date: Wed, 23 Mar 2016 21:32:08 +0100
libinput: fix and optimize build
Buildbots are reporting the following build failure:
-snip-
CCLD test-build-linker
../src/.libs/libinput.so: undefined reference to `static_assert'
-snap-
Since this is the only call to static_assert within the library,
removing this assertion seems to be reasonable.
While at, speed up the build by not building tests and documentation.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Diffstat:
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/libs/libinput/Makefile b/libs/libinput/Makefile
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
TARGET_CFLAGS+= -std=gnu99
-CONFIGURE_ARGS += --disable-libwacom
+CONFIGURE_ARGS += --disable-libwacom --disable-tests --disable-documentation
define Package/libinput
SECTION:=libs
diff --git a/libs/libinput/patches/002-static_assert.patch b/libs/libinput/patches/002-static_assert.patch
@@ -0,0 +1,14 @@
+--- a/src/evdev-tablet.c
++++ b/src/evdev-tablet.c
+@@ -1155,9 +1155,11 @@ static void
+ tablet_mark_all_axes_changed(struct tablet_dispatch *tablet,
+ struct libinput_tablet_tool *tool)
+ {
++#if 0
+ static_assert(sizeof(tablet->changed_axes) ==
+ sizeof(tool->axis_caps),
+ "Mismatching array sizes");
++#endif
+
+ memcpy(tablet->changed_axes,
+ tool->axis_caps,