NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnetfilter_conntrack: fix static linking

Browse Source 
It has a hardcoded -ldl link invocation, so drop it. Fixes:
http://autobuild.buildroot.net/results/66ba5f76694d0738b113463579ce6b2fa49a89d6/

Also add hash file and rename uclinux patch to new naming convention.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Zacarias 2015-01-14 13:02:43 -03:00 committed by Thomas Petazzoni
parent 87351e825a
commit 17cac79d66
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
package/libnetfilter_conntrack/libnetfilter_conntrack-01-uclinux.patch → package/libnetfilter_conntrack/0001-uclinux.patch
View File

27
package/libnetfilter_conntrack/0002-src-Makefile.am-drop-hardcoded-ldl.patch Normal file
View File

@ -0,0 +1,27 @@
From b8d32eff8dbfff5a93b6ea6ee9f5747e16cb32c4 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 14 Jan 2015 10:53:20 -0300
Subject: [PATCH] src/Makefile.am: drop hardcoded -ldl
This breaks static builds where the toolchain completely lacks libdl.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d6c905..374598a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,6 @@ lib_LTLIBRARIES = libnetfilter_conntrack.la
libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \
expect/libnfexpect.la \
${LIBNFNETLINK_LIBS} ${LIBMNL_LIBS}
-libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink -ldl \
+libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \
-version-info $(LIBVERSION)
libnetfilter_conntrack_la_SOURCES = main.c callback.c
--
2.0.5

3
package/libnetfilter_conntrack/libnetfilter_conntrack.hash Normal file
View File

@ -0,0 +1,3 @@
# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.tar.bz2.{md5sum,sha1sum}
md5 18cf80c4b339a3285e78822dbd4f08d7 libnetfilter_conntrack-1.0.4.tar.bz2
sha1 34fae1a30cbd51d46945e9f35790118c3462b0c6 libnetfilter_conntrack-1.0.4.tar.bz2

1
package/libnetfilter_conntrack/libnetfilter_conntrack.mk
View File

@ -9,6 +9,7 @@ LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_
LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
# For 0001-uclinux.patch & 0002-src-Makefile.am-drop-hardcoded-ldl.patch
LIBNETFILTER_CONNTRACK_AUTORECONF = YES
LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+
LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING