matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

build: Remove the old PIC/PIE patch, let libtool sort it out

Browse source 
* Remove the old change from '08 to add in PIE arguments at automake level.
  Versions of libtool since then know how to deal with -fpie and do the right
  thing according to whether its building shared or executable objects.
  So just pass '-fpie' as CFLAG and let libtool do its thing.
This commit is contained in:
Paul Jakma 2015-08-20 21:30:17 +01:00 committed by Donald Sharp
parent 9f6d6b12ac
commit 95bb83054b
12 changed files with 12 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bgpd/Makefile.am
View file

@ -4,8 +4,7 @@ INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
noinst_LIBRARIES = libbgp.a
sbin_PROGRAMS = bgpd

25
configure.ac
View file

@ -203,7 +203,7 @@ AC_GNU_SOURCE
dnl -------
dnl libtool
dnl -------
AC_PROG_LIBTOOL
LT_INIT
dnl ----------------------
dnl Packages configuration
@ -1669,29 +1669,6 @@ dnl ----------
CONFDATE=`date '+%Y%m%d'`
AC_SUBST(CONFDATE)
dnl Conditionally enable PIE support for GNU toolchains.
AC_ARG_ENABLE(pie, AS_HELP_STRING([--disable-pie], [Do not build tools as a Position Independent Executables]))
if test "$enable_pie" != "no"; then
AC_CACHE_CHECK([whether $CC accepts PIE flags], [ap_cv_cc_pie], [
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS -fPIE"
LDFLAGS="$LDFLAGS -pie"
AC_LINK_IFELSE([AC_LANG_SOURCE([[static int foo[30000]; int main () { return 0; }]])],
[ap_cv_cc_pie=yes], [ap_cv_cc_pie=no]
)
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
])
if test "$ap_cv_cc_pie" = "yes"; then
PICFLAGS="-fPIE"
PILDFLAGS="-pie"
fi
fi
AC_SUBST(PICFLAGS)
AC_SUBST(PILDFLAGS)
dnl -------
dnl DejaGNU
dnl -------

3
isisd/Makefile.am
View file

@ -6,8 +6,7 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
LIBS = @LIBS@
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
noinst_LIBRARIES = libisis.a
sbin_PROGRAMS = isisd

3
ospf6d/Makefile.am
View file

@ -4,8 +4,7 @@ INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
noinst_LIBRARIES = libospf6.a
sbin_PROGRAMS = ospf6d

5
ospfclient/Makefile.am
View file

@ -22,6 +22,5 @@ ospfclient_SOURCES = \
ospfclient_LDADD = libospfapiclient.la \
../ospfd/libospf.la ../lib/libzebra.la @LIBCAP@
ospfclient_CFLAGS = $(AM_CFLAGS) $(PICFLAGS)
ospfclient_LDFLAGS = $(AM_LDFLAGS) $(PILDFLAGS)
ospfclient_CFLAGS = $(AM_CFLAGS)
ospfclient_LDFLAGS = $(AM_LDFLAGS)

3
pimd/Makefile.am
View file

@ -39,8 +39,7 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" $(PIM_DEFS)
INSTALL_SDATA=@INSTALL@ -m 600
LIBS = @LIBS@
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
noinst_LIBRARIES = libpim.a
sbin_PROGRAMS = pimd

3
ripd/Makefile.am
View file

@ -4,8 +4,7 @@ INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
noinst_LIBRARIES = librip.a
sbin_PROGRAMS = ripd

3
ripngd/Makefile.am
View file

@ -4,8 +4,7 @@ INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
noinst_LIBRARIES = libripng.a
sbin_PROGRAMS = ripngd

3
tests/Makefile.am
View file

@ -16,9 +16,6 @@ EXTRA_DIST = \
INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
AM_CFLAGS = $(PICFLAGS)
AM_LDFLAGS = $(PILDFLAGS)
if BGPD
TESTS_BGPD = aspathtest testbgpcap ecommtest testbgpmpattr testbgpmpath
DEJATOOL += bgpd

3
vtysh/Makefile.am
View file

@ -5,8 +5,7 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
LIBS = @LIBS@ @CURSES@ @LIBPAM@
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
bin_PROGRAMS = vtysh

3
watchquagga/Makefile.am
View file

@ -3,8 +3,7 @@
INCLUDES = @INCLUDES@ -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
DEFS = @DEFS@ -DSTATEDIR=\"$(localstatedir)/\"
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
sbin_PROGRAMS = watchquagga

3
zebra/Makefile.am
View file

@ -23,8 +23,7 @@ if HAVE_NETLINK
othersrc = zebra_fpm_netlink.c
endif
AM_CFLAGS = $(PICFLAGS) $(WERROR)
AM_LDFLAGS = $(PILDFLAGS)
AM_CFLAGS = $(WERROR)
sbin_PROGRAMS = zebra