- better but still not working patch

Changed files:
    syslog-ng-link.patch -> 1.12

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 7816712af1017f8c013e7a02e684b97c58d323a9..ce8f27807f8999f186a9ea57ce19acff5d312f0d 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -1,12 +1,11 @@
---- syslog-ng-3.2.4/lib/Makefile.am~   2011-02-05 16:01:43.000000000 +0100
-+++ syslog-ng-3.2.4/lib/Makefile.am    2011-05-30 19:22:15.813931407 +0200
-@@ -3,7 +3,7 @@
- export top_srcdir
+--- 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 @@
+ 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"
+-      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"
  
- lib_LTLIBRARIES = libsyslog-ng.la
--libsyslog_ng_la_LIBADD = @CORE_DEPS_LIBS@
-+libsyslog_ng_la_LIBADD = @CORE_DEPS_LIBS@ @GLIB_LIBS@ @EVTLOG_LIBS@ -lcap
- libsyslog_ng_la_LDFLAGS = -no-undefined
- 
- libsyslog_ng_la_SOURCES = \
-
+       # bypass libtool in case we want to do mixed linking because it
+       # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.