Rel 6; let it automatically choose worker-threads based on nr of cpus

[packages/syslog-ng.git] / syslog-ng-link.patch

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 2276ea773398b7cfc83f821914305add538ed9e6..382f8f2ae3a0ada0e66ed8dbe9be0c5527d30153 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,20 +1,26 @@
---- syslog-ng-1.6.6/configure.in.orig  2005-02-04 13:27:00.000000000 +0100
-+++ syslog-ng-1.6.6/configure.in       2005-02-06 15:51:45.089776184 +0100
-@@ -166,7 +166,7 @@
- AC_CHECK_LIB(resolv, __res_init)
- AC_CHECK_LIB(door, door_create)
- AC_CHECK_LIB(socket, socket)
--AC_CHECK_LIB(nsl, gethostbyname)
-+AC_SEARCH_LIBS(gethostbyname, nsl)
- AC_CHECK_FUNCS(select snprintf vsnprintf strerror inet_aton strncpy getutent)
- AC_CHECK_FUNCS(getopt_long strcasecmp strptime)
- 
-@@ -333,7 +333,7 @@
- if test "$enable_full_static" = "yes"; then
-       LIBS="-static $LIBS $LEXLIB $LIBWRAP_LIBS $LIBNET_LIBS $LIBOL_LIBS"
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/configure.ac syslog-ng-3.29.1/configure.ac
+--- syslog-ng-3.29.1.org/configure.ac  2021-02-28 14:27:09.946954361 +0100
++++ syslog-ng-3.29.1/configure.ac      2021-02-28 14:27:10.230296549 +0100
+@@ -1775,9 +1775,9 @@ if test "x$linking_mode" = "xdynamic"; t
+       # syslog-ng binary is linked with the default link command (e.g. libtool)
+       SYSLOGNG_LINK='$(LINK)'
  else
--      LIBS="$LIBS $LIBOL_LIBS -Wl,-Bstatic $LEXLIB $LIBWRAP_LIBS $LIBNET_LIBS   -Wl,-Bdynamic"
-+      LIBS="$LIBS $LIBOL_LIBS $LIBWRAP_LIBS $LIBNET_LIBS -Wl,-Bstatic $LEXLIB -Wl,-Bdynamic"
- fi
- AC_SUBST(YFLAGS)
+-      SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS"
++        SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRETSTORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $LD_END_STATIC $IVYKIS_LIBS $LIBCAP_LIBS $DL_LIBS"
+       TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $SECRETSTORAGE_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
+-      CORE_DEPS_LIBS=""
++        CORE_DEPS_LIBS="$IVYKIS_LIBS"
  
+       # bypass libtool in case we want to do mixed linking because it
+       # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.
+diff -urNp -x '*.orig' syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am syslog-ng-3.29.1/lib/logproto/tests/Makefile.am
+--- syslog-ng-3.29.1.org/lib/logproto/tests/Makefile.am        2020-08-10 20:04:39.000000000 +0200
++++ syslog-ng-3.29.1/lib/logproto/tests/Makefile.am    2021-02-28 14:27:10.230296549 +0100
+@@ -23,7 +23,6 @@ lib_logproto_tests_test_findeom_CFLAGS       =
+       $(TEST_CFLAGS) \
+       -I${top_srcdir}/libtest
+ lib_logproto_tests_test_findeom_LDADD = \
+-      ${top_builddir}/lib/libsyslog-ng.la \
+       ${top_builddir}/libtest/libsyslog-ng-test.a \
+       $(TEST_LDADD)
+ lib_logproto_tests_test_findeom_SOURCES = \