From: Vincent Bernat <vincent@bernat.im>
Date: Wed, 20 May 2015 21:44:21 +0000 (+0200)
Subject: build: don't use -Wl,-pie
X-Git-Tag: 0.7.15~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3db3d0633eee94ad72ee4e2bd427f3d04400aaff;p=thirdparty%2Flldpd.git

build: don't use -Wl,-pie

This flag seems to work when running on i386 on Linux but isn't handled
correctly by libtool and liblldpctl.so ends being without any
symbol. Use -pie only and try an up-to-date libtoolize on OSX to see if
it performs better.
---

diff --git a/.travis/install.sh b/.travis/install.sh
index 78f43735..b742e4cc 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -20,7 +20,7 @@ case "$(uname -s)" in
     Darwin)
         # OS X
         brew update
-        brew install libevent jansson libxml2 check net-snmp
+        brew install libtool autoconf automake libevent jansson libxml2 check net-snmp
         ;;
     *)
         # Linux
diff --git a/configure.ac b/configure.ac
index ca1c8aef..196829df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,8 +98,7 @@ if test x"$hardening" != x"no"; then
   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 -Wl,-pie], [LLDP_LDFLAGS],
-    [AX_LDFLAGS_OPTION([-fPIE -pie], [LLDP_LDFLAGS])])
+  AX_LDFLAGS_OPTION([-fPIE -pie], [LLDP_LDFLAGS])
 fi
 
 # OS