diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2013-12-10 09:23:29 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-12-10 13:39:49 +0100 |
| commit | ce9029119a3e44e97b40c4c827e458e9ebe5e83a (patch) | |
| tree | fafaeab62a0166b611d490b5c61f9987fa749933 /package/ulogd | |
| parent | 3e1e7db3cc677e9d68a7f0ec74406ab986dcc512 (diff) | |
ulogd: link conditionally to libpthread
libpthread is only needed for the database backends so don't link
against it if it's not available.
Fixes:
http://autobuild.buildroot.net/results/527/527d9d4f42af0ffc110e4f52701df279f466a89a/
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ulogd')
| -rw-r--r-- | package/ulogd/ulogd-01-pthread-conditional.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/package/ulogd/ulogd-01-pthread-conditional.patch b/package/ulogd/ulogd-01-pthread-conditional.patch new file mode 100644 index 000000000..b33e0bc9c --- /dev/null +++ b/package/ulogd/ulogd-01-pthread-conditional.patch @@ -0,0 +1,45 @@ +From 389bade377e6e7335304636ea1ebd0a81b0c235e Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <gustavo@zacarias.com.ar> +Date: Tue, 10 Dec 2013 09:11:00 -0300 +Subject: [PATCH ulogd] ulogd: use AC_SEARCH_LIBS for libpthread + +Some uClibc-based toolchains lack threading support, so use +AC_SEARCH_LIB instead of AC_CHECK_LIB to check for libpthread +availability and link conditionally if found since it's only used for +the database backends. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + configure.ac | 3 ++- + src/Makefile.am | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7f5ffa9..5e45aaa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -39,7 +39,8 @@ AC_CHECK_FUNCS(socket strerror) + regular_CFLAGS="-Wall -Wextra -Wno-unused-parameter" + AC_SUBST([regular_CFLAGS]) + +-AC_CHECK_LIB(pthread, pthread_create) ++AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""]) ++AC_SUBST([libpthread_LIBS]) + + dnl Check for the right nfnetlink version + PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 1097468..998e776 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,5 +7,5 @@ AM_CFLAGS = ${regular_CFLAGS} + sbin_PROGRAMS = ulogd + + ulogd_SOURCES = ulogd.c select.c timer.c rbtree.c conffile.c hash.c addr.c +-ulogd_LDADD = ${libdl_LIBS} +-ulogd_LDFLAGS = -export-dynamic -lpthread ++ulogd_LDADD = ${libdl_LIBS} ${libpthread_LIBS} ++ulogd_LDFLAGS = -export-dynamic +-- +1.8.3.2 + |