From: Sung-Jin Park Date: Fri, 11 Aug 2017 07:34:55 +0000 (+0900) Subject: libinput-device-group: apply ASLR X-Git-Tag: submit/tizen/20170811.074541^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=490abaec73a99fa8fb8a48c977e36fe5414498bf;p=platform%2Fupstream%2Flibinput.git libinput-device-group: apply ASLR Change-Id: I517dde04ad048cace459d23f3df63d8deb26c5c6 Signed-off-by: Sung-Jin Park --- diff --git a/configure.ac b/configure.ac index 3a94f249..673e9df9 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,18 @@ AS_CASE($with_udev_dir, UDEV_DIR=${udevdir} AC_SUBST(UDEV_DIR) +AC_ARG_VAR([LIBINPUT_EXECUTABLE_CFLAGS], [cflags for libinput executable]) +if test x"${LIBINPUT_EXECUTABLE_CFLAGS}" != x""; then + AC_DEFINE_UNQUOTED([LIBINPUT_EXECUTABLE_CFLAGS], ["${LIBINPUT_EXECUTABLE_CFLAGS}"], [Libinput executable cflags]) + AC_SUBST(LIBINPUT_EXECUTABLE_CFLAGS) +fi + +AC_ARG_VAR([LIBINPUT_EXECUTABLE_LIBS], [linker flags for libinput executable]) +if test x"${LIBINPUT_EXECUTABLE_LIBS}" != x""; then + AC_DEFINE_UNQUOTED([LIBINPUT_EXECUTABLE_LIBS], ["${LIBINPUT_EXECUTABLE_LIBS}"], [Libinput executable linker flags]) + AC_SUBST(LIBINPUT_EXECUTABLE_LIBS) +fi + AC_ARG_ENABLE([documentation], [AC_HELP_STRING([--enable-documentation], [Enable building the documentation (default=auto)])], diff --git a/packaging/libinput.spec b/packaging/libinput.spec index 9aa98dea..5337af35 100644 --- a/packaging/libinput.spec +++ b/packaging/libinput.spec @@ -50,6 +50,9 @@ functionality that users expect. %setup -q cp %{SOURCE1001} . +export LIBINPUT_EXECUTABLE_CFLAGS=" -fPIE " +export LIBINPUT_EXECUTABLE_LIBS=" -pie " + %autogen --with-udev-dir=%{udev_dir} %build diff --git a/udev/Makefile.am b/udev/Makefile.am index 3691172c..eb19c6e7 100644 --- a/udev/Makefile.am +++ b/udev/Makefile.am @@ -2,8 +2,8 @@ udevdir=$(UDEV_DIR) udev_PROGRAMS = libinput-device-group libinput_device_group_SOURCES = libinput-device-group.c -libinput_device_group_CFLAGS = $(LIBUDEV_CFLAGS) $(GCC_CFLAGS) -libinput_device_group_LDADD = $(LIBUDEV_LIBS) +libinput_device_group_CFLAGS = $(LIBUDEV_CFLAGS) $(GCC_CFLAGS) $(LIBINPUT_EXECUTABLE_CFLAGS) +libinput_device_group_LDADD = $(LIBUDEV_LIBS) $(LIBINPUT_EXECUTABLE_LIBS) udev_rulesdir=$(UDEV_DIR)/rules.d dist_udev_rules_DATA = 80-libinput-device-groups.rules