and use it when available --- configure.ac | 1 + daemon/Makefile.am | 1 + m4/virt-linker-no-indirect.m4 | 30 ++++++++++++++++++++++++++++++ src/Makefile.am | 1 + tests/Makefile.am | 1 + tools/Makefile.am | 1 + 6 files changed, 35 insertions(+) create mode 100644 m4/virt-linker-no-indirect.m4 diff --git a/configure.ac b/configure.ac index ac8cfa1..25d91ce 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,7 @@ AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) LIBVIRT_COMPILE_WARNINGS LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO +LIBVIRT_LINKER_NO_INDIRECT LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATTR diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 5cd95aa..e34868b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -129,6 +129,7 @@ libvirtd_LDFLAGS = \ $(PIE_LDFLAGS) \ $(RELRO_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(NULL) libvirtd_LDADD = \ diff --git a/m4/virt-linker-no-indirect.m4 b/m4/virt-linker-no-indirect.m4 new file mode 100644 index 0000000..2ccd960 --- /dev/null +++ b/m4/virt-linker-no-indirect.m4 @@ -0,0 +1,30 @@ +dnl +dnl Check for --no-copy-dt-needed-entries +dnl +dnl Copyright (C) 2013 Guido Günther <agx@xxxxxxxxxxx> +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_LINKER_NO_INDIRECT],[ + AC_MSG_CHECKING([for how to avoid indirect lib deps]) + + NO_INDIRECT_LDFLAGS= + `$LD --help 2>&1 | grep -- "--no-copy-dt-needed-entries" >/dev/null` && \ + NO_INDIRECT_LDFLAGS="-Wl,--no-copy-dt-needed-entries" + AC_SUBST([NO_INDIRECT_LDFLAGS]) + + AC_MSG_RESULT([$NO_INDIRECT_LDFLAGS]) +]) diff --git a/src/Makefile.am b/src/Makefile.am index 7c3d8a1..faa2cd6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,6 +35,7 @@ AM_CFLAGS = $(LIBXML_CFLAGS) \ AM_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(RELRO_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(NULL) EXTRA_DIST = $(conf_DATA) util/keymaps.csv diff --git a/tests/Makefile.am b/tests/Makefile.am index 9098dec..86c3e11 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,6 +50,7 @@ endif LDADDS = \ $(WARN_CFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(PROBES_O) \ ../src/libvirt.la \ ../gnulib/lib/libgnu.la diff --git a/tools/Makefile.am b/tools/Makefile.am index be7ed23..c5bd5bb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,6 +24,7 @@ INCLUDES = \ AM_LDFLAGS = \ $(RELRO_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(NULL) POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" -- 1.8.4.rc3 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list