packages: syslog-ng/syslog-ng.spec, syslog-ng/syslog-ng-link.patch (REMOVED...

[arekm]

Author: arekm                        Date: Sat Jun  4 12:48:38 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop link patch since conflicts with syslog-ng developers idea of linking; filterout --as-needed and --no-copy-dt-needed-entries since these also conflict with syslog-ng developers idea of linking

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.211 -> 1.212) , syslog-ng-link.patch (1.12 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.211 packages/syslog-ng/syslog-ng.spec:1.212
--- packages/syslog-ng/syslog-ng.spec:1.211	Mon May 30 19:45:02 2011
+++ packages/syslog-ng/syslog-ng.spec	Sat Jun  4 14:48:33 2011
@@ -35,8 +35,7 @@
 # Source4-md5:	4fa86dc863ed0206c004b3be7292bcbf
 Source5:	%{name}-simple.conf
 Source6:	%{name}.upstart
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-datadir.patch
+Patch0:		%{name}-datadir.patch
 URL:		http://www.balabit.com/products/syslog_ng/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -85,8 +84,15 @@
 Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# syslog-ng has really crazy linking rules (see their bugzilla).
+# Some rules, according to syslog-ng devs, are like this:
+# - libsyslog-ng.so has undefined symbols for third party libraries
+#   and these symbols should go via main syslog-ng binary
+# - same applies for modules
 %if %{without dynamic}
 %define		no_install_post_check_so	1
+# filterout_ld - see comment few lines above
+%define		filterout_ld			-Wl,--as-needed -Wl,--no-copy-dt-needed-entries
 %define		_sbindir			/sbin
 %define		_libdir				/%{_lib}
 %endif
@@ -129,7 +135,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -302,6 +307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212  2011/06/04 12:48:33  arekm
+- drop link patch since conflicts with syslog-ng developers idea of linking; filterout --as-needed and --no-copy-dt-needed-entries since these also conflict with syslog-ng developers idea of linking
+
 Revision 1.211  2011/05/30 17:45:02  arekm
 - todo: relies on libs in /usr/ which is wrong
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.211&r2=1.212&f=u