projects / packages / syslog-ng.git / blame
| Commit | Line | Data |
|---|---|---|
| 6599601c JK |
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 | @@ -1639,9 +1639,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 $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 " | |
| 9 | + 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 " | |
| 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" | |
| 118f372b | 13 | |
| 6599601c JK |
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 -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 | |
| 17 | --- syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am 2018-02-26 15:32:28.000000000 +0100 | |
| 18 | +++ syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am 2018-04-03 09:50:43.000000000 +0200 | |
| 19 | @@ -22,7 +22,7 @@ | |
| 20 | $(TEST_CFLAGS) \ | |
| 21 | -I${top_srcdir}/libtest | |
| 118f372b JB |
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 | |
| 6599601c JK |
28 | 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 |
| 29 | --- syslog-ng-syslog-ng-3.14.1.orig/modules/diskq/Makefile.am 2018-02-26 15:32:28.000000000 +0100 | |
| 30 | +++ syslog-ng-syslog-ng-3.14.1/modules/diskq/Makefile.am 2018-04-03 09:50:43.000000000 +0200 | |
| 31 | @@ -46,8 +46,8 @@ | |
| eebad2d5 JR |
32 | |
| 33 | modules_diskq_dqtool_SOURCES = modules/diskq/dqtool.c | |
| 34 | modules_diskq_dqtool_LDADD = \ | |
| 35 | - $(TOOL_DEPS_LIBS) \ | |
| 36 | $(MODULE_DEPS_LIBS) \ | |
| 37 | + $(TOOL_DEPS_LIBS) \ | |
| 38 | $(LIBSYSLOG_NG_DISK_BUFFER) | |
| 39 | ||
| 40 | modules/diskq modules/diskq/ mod-diskq: modules/diskq/libdisk-buffer.la \ | |
| 6599601c JK |
41 | 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 |
| 42 | --- syslog-ng-syslog-ng-3.14.1.orig/syslog-ng-ctl/Makefile.am 2018-02-26 15:32:28.000000000 +0100 | |
| 43 | +++ syslog-ng-syslog-ng-3.14.1/syslog-ng-ctl/Makefile.am 2018-04-03 09:50:43.000000000 +0200 | |
| 44 | @@ -10,5 +10,6 @@ | |
| 45 | EXTRA_DIST += \ | |
| 46 | syslog-ng-ctl/control-client-unix.c | |
| 47 | ||
| 48 | -syslog_ng_ctl_syslog_ng_ctl_LDADD = lib/libsyslog-ng.la @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@ | |
| 49 | - | |
| 50 | +syslog_ng_ctl_syslog_ng_ctl_DEPENDENCIES = lib/libsyslog-ng.la | |
| 51 | +syslog_ng_ctl_syslog_ng_ctl_LDADD = -L${top_builddir}/lib/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@ | |
| 52 | +syslog_ng_ctl_syslog_ng_ctl_LINK = @SYSLOGNG_LINK@ |