99 lines
2.8 KiB
Diff
99 lines
2.8 KiB
Diff
From bf9a0112249ae64ad9c432d63dc6bd0e6ab16cb0 Mon Sep 17 00:00:00 2001
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Date: Wed, 10 Oct 2018 20:06:34 +1000
|
|
Subject: [PATCH libevdev] Drop custom linker/compiler flags
|
|
|
|
Let those be defined by the build environment
|
|
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
---
|
|
configure.ac | 29 -----------------------------
|
|
libevdev/Makefile.am | 4 ++--
|
|
tools/Makefile.am | 2 +-
|
|
3 files changed, 3 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 3fe8746..7dc00cd 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -56,16 +56,6 @@ LT_PREREQ([2.2])
|
|
LT_INIT
|
|
LT_PATH_LD
|
|
|
|
-with_ldflags=""
|
|
-if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
|
|
- CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
|
|
- -Wl,--as-needed \
|
|
- -Wl,--gc-sections \
|
|
- -Wl,-z,relro \
|
|
- -Wl,-z,now])
|
|
-fi
|
|
-AC_SUBST([GNU_LD_FLAGS], $with_ldflags)
|
|
-
|
|
AC_CHECK_LIB([m], [round])
|
|
|
|
PKG_PROG_PKG_CONFIG()
|
|
@@ -84,25 +74,6 @@ AC_ARG_ENABLE([test-run],
|
|
[run_tests="$enableval"], [run_tests="yes"])
|
|
AM_CONDITIONAL(RUN_TESTS, [test "x$run_tests" = "xyes"])
|
|
|
|
-with_cflags=""
|
|
-if test "x$GCC" = "xyes"; then
|
|
- CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
|
- -Wall \
|
|
- -Wextra \
|
|
- -Wno-unused-parameter \
|
|
- -Wstrict-prototypes \
|
|
- -Wmissing-prototypes \
|
|
- -fvisibility=hidden \
|
|
- -pipe \
|
|
- -fno-strict-aliasing \
|
|
- -ffunction-sections \
|
|
- -fdata-sections \
|
|
- -fno-strict-aliasing \
|
|
- -fdiagnostics-show-option \
|
|
- -fno-common])
|
|
-fi
|
|
-AC_SUBST([GCC_CFLAGS], $with_cflags)
|
|
-
|
|
AC_PATH_PROG(DOXYGEN, [doxygen])
|
|
if test "x$DOXYGEN" = "x"; then
|
|
AC_MSG_WARN([doxygen not found - required for documentation])
|
|
diff --git a/libevdev/Makefile.am b/libevdev/Makefile.am
|
|
index fcb434d..99367a5 100644
|
|
--- a/libevdev/Makefile.am
|
|
+++ b/libevdev/Makefile.am
|
|
@@ -1,6 +1,6 @@
|
|
lib_LTLIBRARIES=libevdev.la
|
|
|
|
-AM_CPPFLAGS = $(GCC_CFLAGS) $(GCOV_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)
|
|
+AM_CPPFLAGS = $(GCOV_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)
|
|
AM_LDFLAGS = $(GCOV_LDFLAGS)
|
|
|
|
libevdev_la_SOURCES = \
|
|
@@ -20,7 +20,7 @@ libevdev_la_LDFLAGS = \
|
|
$(AM_LDFLAGS) \
|
|
-version-info $(LIBEVDEV_LT_VERSION) \
|
|
-Wl,--version-script="$(srcdir)/libevdev.sym" \
|
|
- $(GNU_LD_FLAGS)
|
|
+ $(NULL)
|
|
|
|
EXTRA_libevdev_la_DEPENDENCIES = $(srcdir)/libevdev.sym
|
|
|
|
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
|
index d699c5c..13fe286 100644
|
|
--- a/tools/Makefile.am
|
|
+++ b/tools/Makefile.am
|
|
@@ -4,7 +4,7 @@ bin_PROGRAMS = \
|
|
mouse-dpi-tool \
|
|
libevdev-tweak-device
|
|
|
|
-AM_CPPFLAGS = $(GCC_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/libevdev
|
|
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/libevdev
|
|
libevdev_ldadd = $(top_builddir)/libevdev/libevdev.la
|
|
|
|
libevdev_events_SOURCES = libevdev-events.c
|
|
--
|
|
2.19.1
|
|
|