- up to 3.24.1

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

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index ce8f27807f8999f186a9ea57ce19acff5d312f0d..7ce274fe7deb751bb0634c82ec9ea65b13c871c9 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,11 +1,27 @@
---- syslog-ng-3.2.4/configure.in~      2011-05-04 17:45:07.000000000 +0200
-+++ syslog-ng-3.2.4/configure.in       2011-05-30 20:09:43.852080011 +0200
-@@ -770,7 +770,7 @@
+diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/configure.ac syslog-ng-syslog-ng-3.14.1/configure.ac
+--- syslog-ng-syslog-ng-3.14.1.orig/configure.ac       2018-04-03 09:50:19.000000000 +0200
++++ syslog-ng-syslog-ng-3.14.1/configure.ac    2018-04-03 09:51:38.000000000 +0200
+@@ -1626,9 +1626,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
-       SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS "
-         TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_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} $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="$LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_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 -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am
+--- syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am     2018-02-26 15:32:28.000000000 +0100
++++ syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am  2018-04-03 09:50:43.000000000 +0200
+@@ -24,8 +24,7 @@ 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 = \
+