syslog-ng-link.patch

   1 diff -ur syslog-ng-syslog-ng-3.16.1.orig/configure.ac syslog-ng-syslog-ng-3.16.1/configure.ac
   2 --- syslog-ng-syslog-ng-3.16.1.orig/configure.ac        2018-07-11 16:33:39.521544308 +0000
   3 +++ syslog-ng-syslog-ng-3.16.1/configure.ac     2018-07-11 16:36:27.353534304 +0000
   4 @@ -1658,9 +1658,9 @@
   5         # syslog-ng binary is linked with the default link command (e.g. libtool)
   6         SYSLOGNG_LINK='$(LINK)'
   7  else
   8 -       SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_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"
   9 +       SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_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"
  10         TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
  11 -       CORE_DEPS_LIBS=""
  12 +       CORE_DEPS_LIBS="$IVYKIS_LIBS"
  13
  14         # bypass libtool in case we want to do mixed linking because it
  15         # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.
  16 diff -ur syslog-ng-syslog-ng-3.16.1.orig/lib/logproto/tests/Makefile.am syslog-ng-syslog-ng-3.16.1/lib/logproto/tests/Makefile.am
  17 --- syslog-ng-syslog-ng-3.16.1.orig/lib/logproto/tests/Makefile.am      2018-06-18 15:14:55.000000000 +0000
  18 +++ syslog-ng-syslog-ng-3.16.1/lib/logproto/tests/Makefile.am   2018-07-11 16:34:00.392543064 +0000
  19 @@ -22,7 +22,7 @@
  20         $(TEST_CFLAGS) \
  21         -I${top_srcdir}/libtest
  22  lib_logproto_tests_test_findeom_LDADD  = \
  23 -       ${top_builddir}/lib/libsyslog-ng.la \
  24 +       $(TEST_LDADD) \
  25         ${top_builddir}/libtest/libsyslog-ng-test.a
  26  lib_logproto_tests_test_findeom_SOURCES = \
  27         lib/logproto/tests/test_findeom.c