X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=syslog-ng-link.patch;h=1ba073cdaa9b982f68a7a1340615737d2e2609b5;hb=e2663c45b1821d34e9f8cc0d7f6ce80deb2ee7c6;hp=9ae419087b725a65f5e7c3786790be2b51fcabff;hpb=39261fbb5903f57b19fae2257ee756ac6c123753;p=packages%2Fsyslog-ng.git diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch index 9ae4190..1ba073c 100644 --- a/syslog-ng-link.patch +++ b/syslog-ng-link.patch @@ -1,12 +1,21 @@ 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 -@@ -1639,9 +1639,9 @@ +@@ -793,7 +793,7 @@ + dnl *************************************************************************** + + EVTLOG_LIBS="\$(top_builddir)/lib/eventlog/src/libevtlog.la" +-EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.la" ++EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.so" + EVTLOG_CFLAGS="-I\$(top_srcdir)/lib/eventlog/src -I\$(top_builddir)/lib/eventlog/src" + + dnl *************************************************************************** +@@ -1687,9 +1687,9 @@ # 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_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 " -+ 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} $LD_END_STATIC $IVYKIS_LIBS $LIBCAP_LIBS $DL_LIBS " ++ 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 " TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS" - CORE_DEPS_LIBS="" + CORE_DEPS_LIBS="$IVYKIS_LIBS"