| 1 |
pva 11/09/03 13:25:06 |
| 2 |
|
| 3 |
Added: iptables-1.4.12.1-lm.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-firewall/iptables/files/iptables-1.4.12.1-lm.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.12.1-lm.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: iptables-1.4.12.1-lm.patch |
| 16 |
=================================================================== |
| 17 |
parent 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363 (v1.4.12-43-g2ca6273) |
| 18 |
commit d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb |
| 19 |
Author: Jan Engelhardt <jengelh@×××××××.de> |
| 20 |
Date: Sat Sep 3 13:34:40 2011 +0200 |
| 21 |
|
| 22 |
libxt_statistic: link with -lm |
| 23 |
|
| 24 |
$ ldd -r libxt_statistic.so |
| 25 |
undefined symbol: lround (./libxt_statistic.so) |
| 26 |
|
| 27 |
References: https://bugs.archlinux.org/task/25358 |
| 28 |
Signed-off-by: Jan Engelhardt <jengelh@×××××××.de> |
| 29 |
--- |
| 30 |
extensions/GNUmakefile.in | 5 ++++- |
| 31 |
iptables/Makefile.am | 9 +++++++-- |
| 32 |
2 files changed, 11 insertions(+), 3 deletions(-) |
| 33 |
|
| 34 |
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in |
| 35 |
index 2b48d84..dbf210c 100644 |
| 36 |
--- a/extensions/GNUmakefile.in |
| 37 |
+++ b/extensions/GNUmakefile.in |
| 38 |
@@ -90,11 +90,14 @@ init%.o: init%.c |
| 39 |
# Shared libraries |
| 40 |
# |
| 41 |
lib%.so: lib%.oo |
| 42 |
- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<; |
| 43 |
+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD}; |
| 44 |
|
| 45 |
lib%.oo: ${srcdir}/lib%.c |
| 46 |
${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; |
| 47 |
|
| 48 |
+# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD |
| 49 |
+xt_statistic_LIBADD = -lm |
| 50 |
+ |
| 51 |
|
| 52 |
# |
| 53 |
# Static bits |
| 54 |
diff --git a/iptables/Makefile.am b/iptables/Makefile.am |
| 55 |
index addb159..f6db32d 100644 |
| 56 |
--- a/iptables/Makefile.am |
| 57 |
+++ b/iptables/Makefile.am |
| 58 |
@@ -6,12 +6,17 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir} |
| 59 |
lib_LTLIBRARIES = libxtables.la |
| 60 |
libxtables_la_SOURCES = xtables.c xtoptions.c |
| 61 |
libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage} |
| 62 |
+libxtables_la_LIBADD = |
| 63 |
+if ENABLE_STATIC |
| 64 |
+# With --enable-static, shipped extensions are linked into the main executable, |
| 65 |
+# so we need all the LIBADDs here too |
| 66 |
+libxtables_la_LIBADD += -lm |
| 67 |
+endif |
| 68 |
if ENABLE_SHARED |
| 69 |
libxtables_la_CFLAGS = ${AM_CFLAGS} |
| 70 |
-libxtables_la_LIBADD = -ldl |
| 71 |
+libxtables_la_LIBADD += -ldl |
| 72 |
else |
| 73 |
libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1 |
| 74 |
-libxtables_la_LIBADD = |
| 75 |
endif |
| 76 |
|
| 77 |
xtables_multi_SOURCES = xtables-multi.c iptables-xml.c |
Archives