From: Vincent Bernat <vincent@bernat.im>
Date: Tue, 19 May 2015 13:46:41 +0000 (+0200)
Subject: build: don't enable PIE when using embedded libevent
X-Git-Tag: 0.7.15~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1aa3748ca854f6e1db33eaf5832eac361b02e801;p=thirdparty%2Flldpd.git

build: don't enable PIE when using embedded libevent
---

diff --git a/configure.ac b/configure.ac
index cacb7cfc..ce240c1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,22 +89,6 @@ AX_LDFLAGS_OPTION([-Wl,-z,now], [LLDP_LDFLAGS])
 lldp_CHECK_OS
 lldp_CFLAGS_OS
 
-# Hardening
-AC_ARG_ENABLE([hardening],
-  [AS_HELP_STRING([--enable-hardening],
-    [Enable compiler and linker options to frustrate memory corruption exploits @<:@yes@:>@])],
-  [hardening="$enableval"],
-  [hardening="yes"])
-
-if test x"$hardening" != x"no"; then
-  AX_CFLAGS_GCC_OPTION([-fstack-protector], [LLDP_CFLAGS])
-  AX_CFLAGS_GCC_OPTION([-fstack-protector-all], [LLDP_CFLAGS])
-  AX_CFLAGS_GCC_OPTION([-fstack-protector-strong], [LLDP_CFLAGS])
-  AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2], [LLDP_CPPFLAGS])
-  AX_CFLAGS_GCC_OPTION([-fPIE], [LLDP_CFLAGS])
-  AX_LDFLAGS_OPTION([-fPIE -pie], [LLDP_LDFLAGS])
-fi
-
 AC_CACHE_SAVE
 
 # Checks for header files.
@@ -293,6 +277,25 @@ lldp_ARG_ENABLE([dot3], [Dot3 extension (PHY stuff)], [yes])
 # Oldies
 lldp_ARG_ENABLE([oldies], [compatibility with Linux kernel older than 2.6.18], [no])
 
+
+# Hardening
+AC_ARG_ENABLE([hardening],
+  [AS_HELP_STRING([--enable-hardening],
+    [Enable compiler and linker options to frustrate memory corruption exploits @<:@yes@:>@])],
+  [hardening="$enableval"],
+  [hardening="yes"])
+
+if test x"$hardening" != x"no"; then
+  AX_CFLAGS_GCC_OPTION([-fstack-protector], [LLDP_CFLAGS])
+  AX_CFLAGS_GCC_OPTION([-fstack-protector-all], [LLDP_CFLAGS])
+  AX_CFLAGS_GCC_OPTION([-fstack-protector-strong], [LLDP_CFLAGS])
+  AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2], [LLDP_CPPFLAGS])
+  if test x"$LIBEVENT_EMBEDDED" = x; then
+    AX_CFLAGS_GCC_OPTION([-fPIE], [LLDP_CFLAGS])
+    AX_LDFLAGS_OPTION([-fPIE -pie], [LLDP_LDFLAGS])
+  fi
+fi
+
 #######################
 # Output results
 AC_SUBST([LLDP_CFLAGS])