netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Engelhardt <jengelh@medozas.de>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH 1/3] libiptc: remove libiptc.so
Date: Fri, 30 Dec 2011 02:46:32 +0100	[thread overview]
Message-ID: <1325209595-23244-2-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1325209595-23244-1-git-send-email-jengelh@medozas.de>

When Linux distributions started to ship binutils-ld defaulting to
-Wl,--as-needed, we had to add a hack (-Wl,--no-as-needed) to the
iptables build such that libiptc.so continued to link to libip4tc.so
and libip6tc.so despite not requesting any symbols from there.

Given that distros start shipping binutils-ld defaulting to
-Wl,--no-copy-dt-needed-entries, 3rd-party programs linking
to -liptc will ignore libiptc.so's DT_NEEDED entries by default and
not search for symbols there. So libiptc.so has finally become
useless, so remove it. Dependent programs should have been using the
pkg-config infrastructure, where quering for "iptc" returned "-lip4tc
-lip6tc" for long enough.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac        |    5 -----
 libiptc/Makefile.am |    7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f85b83..8eb7572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,11 +53,6 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
 	[Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]),
 	[pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig'])
 
-libiptc_LDFLAGS2="";
-AX_CHECK_LINKER_FLAGS([-Wl,--no-as-needed],
-	[libiptc_LDFLAGS2="-Wl,--no-as-needed"])
-AC_SUBST([libiptc_LDFLAGS2])
-
 AC_MSG_CHECKING([whether $LD knows -Wl,--no-undefined])
 saved_LDFLAGS="$LDFLAGS";
 LDFLAGS="-Wl,--no-undefined";
diff --git a/libiptc/Makefile.am b/libiptc/Makefile.am
index f789d34..3803fe7 100644
--- a/libiptc/Makefile.am
+++ b/libiptc/Makefile.am
@@ -5,11 +5,8 @@ AM_CPPFLAGS      = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}
 
 pkgconfig_DATA      = libiptc.pc libip4tc.pc libip6tc.pc
 
-lib_LTLIBRARIES     = libip4tc.la libip6tc.la libiptc.la
-libiptc_la_SOURCES  =
-libiptc_la_LIBADD   = libip4tc.la libip6tc.la
-libiptc_la_LDFLAGS  = -version-info 0:0:0 ${libiptc_LDFLAGS2}
+lib_LTLIBRARIES     = libip4tc.la libip6tc.la
 libip4tc_la_SOURCES = libip4tc.c
 libip4tc_la_LDFLAGS = -version-info 1:0:1
 libip6tc_la_SOURCES = libip6tc.c
-libip6tc_la_LDFLAGS = -version-info 1:0:1 ${libiptc_LDFLAGS2}
+libip6tc_la_LDFLAGS = -version-info 1:0:1
-- 
1.7.3.4


  reply	other threads:[~2011-12-30  1:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-30  1:46 iptables: response to modern linkers, and symbol maps Jan Engelhardt
2011-12-30  1:46 ` Jan Engelhardt [this message]
2011-12-30 11:54   ` [PATCH 1/3] libiptc: remove libiptc.so Pablo Neira Ayuso
2011-12-31 20:14     ` Jan Engelhardt
2011-12-30  1:46 ` [PATCH 2/3] libiptc: add symbol maps to libiptc Jan Engelhardt
2011-12-30 11:48   ` Pablo Neira Ayuso
2011-12-30 13:49     ` Jan Engelhardt
2011-12-31 16:36       ` Pablo Neira Ayuso
2011-12-30  1:46 ` [PATCH 3/3] libipq: add symbol map to libipq Jan Engelhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1325209595-23244-2-git-send-email-jengelh@medozas.de \
    --to=jengelh@medozas.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).