packages: syslog-ng/syslog-ng-link.patch - better but still not working patch

[arekm]

Author: arekm                        Date: Mon May 30 18:29:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- better but still not working patch

---- Files affected:
packages/syslog-ng:
   syslog-ng-link.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng-link.patch
diff -u packages/syslog-ng/syslog-ng-link.patch:1.11 packages/syslog-ng/syslog-ng-link.patch:1.12
--- packages/syslog-ng/syslog-ng-link.patch:1.11	Mon May 30 19:31:33 2011
+++ packages/syslog-ng/syslog-ng-link.patch	Mon May 30 20:29:43 2011
@@ -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.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng-link.patch?r1=1.11&r2=1.12&f=u