libinput-device-group: apply ASLR 64/143764/1 accepted/tizen/4.0/unified/20170828.222825 accepted/tizen/unified/20170814.060129 submit/tizen/20170811.074541 submit/tizen_4.0/20170828.100006
authorSung-Jin Park <sj76.park@samsung.com>
Fri, 11 Aug 2017 07:34:55 +0000 (16:34 +0900)
committerSung-Jin Park <sj76.park@samsung.com>
Fri, 11 Aug 2017 07:34:55 +0000 (16:34 +0900)
Change-Id: I517dde04ad048cace459d23f3df63d8deb26c5c6
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
configure.ac
packaging/libinput.spec
udev/Makefile.am

index 3a94f2491437d54d98884e68e9be766465040157..673e9df9a609cae0e82999e69fd663797ff261ac 100644 (file)
@@ -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)])],
index 9aa98deae746170503cf323604cc66540a9ef572..5337af3577e56861e5115f0b241134cc3702cd21 100644 (file)
@@ -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
index 3691172c30c6c1d3903705b99db76b458058f531..eb19c6e7a56ef80613e6fd44a357db7bd63682bf 100644 (file)
@@ -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