syslog-ng-link.patch

   1 diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/configure.ac syslog-ng-syslog-ng-3.14.1/configure.ac
   2 --- syslog-ng-syslog-ng-3.14.1.orig/configure.ac        2018-04-03 09:50:19.000000000 +0200
   3 +++ syslog-ng-syslog-ng-3.14.1/configure.ac     2018-04-03 09:51:38.000000000 +0200
   4 @@ -792,8 +792,8 @@
   5  dnl libevtlog headers/libraries (remove after relicensing libevtlog)
   6  dnl ***************************************************************************
   7
   8 -EVTLOG_LIBS="\$(top_builddir)/lib/eventlog/src/libevtlog.la"
   9 -EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.la"
  10 +EVTLOG_LIBS="-Wl,${WHOLE_ARCHIVE_OPT} -L\$(top_builddir)/lib/eventlog/src -levtlog -Wl,${NO_WHOLE_ARCHIVE_OPT}"
  11 +EVTLOG_NO_LIBTOOL_LIBS="-Wl,${WHOLE_ARCHIVE_OPT} -L\$(top_builddir)/lib/eventlog/src/.libs -levtlog -Wl,${NO_WHOLE_ARCHIVE_OPT}"
  12  EVTLOG_CFLAGS="-I\$(top_srcdir)/lib/eventlog/src -I\$(top_builddir)/lib/eventlog/src"
  13
  14  dnl ***************************************************************************
  15 @@ -1639,9 +1639,9 @@
  16         # syslog-ng binary is linked with the default link command (e.g. libtool)
  17         SYSLOGNG_LINK='$(LINK)'
  18  else
  19 -       SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $EVTLOG_NO_LIBTOOL_LIBS $PCRE_LIBS $REGEX_LIBS  -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS "
  20 +       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 "
  21         TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
  22 -       CORE_DEPS_LIBS=""
  23 +       CORE_DEPS_LIBS="$IVYKIS_LIBS"
  24
  25         # bypass libtool in case we want to do mixed linking because it
  26         # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.
  27 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
  28 --- syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am      2018-02-26 15:32:28.000000000 +0100
  29 +++ syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am   2018-04-03 09:50:43.000000000 +0200
  30 @@ -22,7 +22,7 @@
  31         $(TEST_CFLAGS) \
  32         -I${top_srcdir}/libtest
  33  lib_logproto_tests_test_findeom_LDADD  = \
  34 -       ${top_builddir}/lib/libsyslog-ng.la \
  35 +       $(TEST_LDADD) \
  36         ${top_builddir}/libtest/libsyslog-ng-test.a
  37  lib_logproto_tests_test_findeom_SOURCES = \
  38         lib/logproto/tests/test_findeom.c
  39 diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/modules/diskq/Makefile.am syslog-ng-syslog-ng-3.14.1/modules/diskq/Makefile.am
  40 --- syslog-ng-syslog-ng-3.14.1.orig/modules/diskq/Makefile.am   2018-02-26 15:32:28.000000000 +0100
  41 +++ syslog-ng-syslog-ng-3.14.1/modules/diskq/Makefile.am        2018-04-03 09:50:43.000000000 +0200
  42 @@ -46,8 +46,8 @@
  43
  44  modules_diskq_dqtool_SOURCES = modules/diskq/dqtool.c
  45  modules_diskq_dqtool_LDADD = \
  46 -  $(TOOL_DEPS_LIBS) \
  47    $(MODULE_DEPS_LIBS) \
  48 +  $(TOOL_DEPS_LIBS) \
  49    $(LIBSYSLOG_NG_DISK_BUFFER)
  50
  51  modules/diskq modules/diskq/ mod-diskq: modules/diskq/libdisk-buffer.la \
  52 diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/syslog-ng-ctl/Makefile.am syslog-ng-syslog-ng-3.14.1/syslog-ng-ctl/Makefile.am
  53 --- syslog-ng-syslog-ng-3.14.1.orig/syslog-ng-ctl/Makefile.am   2018-02-26 15:32:28.000000000 +0100
  54 +++ syslog-ng-syslog-ng-3.14.1/syslog-ng-ctl/Makefile.am        2018-04-03 09:50:43.000000000 +0200
  55 @@ -10,5 +10,6 @@
  56  EXTRA_DIST                                     +=      \
  57         syslog-ng-ctl/control-client-unix.c
  58
  59 -syslog_ng_ctl_syslog_ng_ctl_LDADD              = lib/libsyslog-ng.la @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@
  60 -
  61 +syslog_ng_ctl_syslog_ng_ctl_DEPENDENCIES       = lib/libsyslog-ng.la
  62 +syslog_ng_ctl_syslog_ng_ctl_LDADD              = -L${top_builddir}/lib/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@
  63 +syslog_ng_ctl_syslog_ng_ctl_LINK               = @SYSLOGNG_LINK@