- merged 3.14.1 from PLD

[packages/syslog-ng.git] / syslog-ng-nolibs.patch

diff --git a/syslog-ng-nolibs.patch b/syslog-ng-nolibs.patch
index 9f97ac7d6d1187476e6ef39a2b91ce41231f09b5..0906f4735328c58ff4c3dc88a6a2ab872896cfe1 100644 (file)
--- a/syslog-ng-nolibs.patch
+++ b/syslog-ng-nolibs.patch
@@ -15,14 +15,3 @@
  
  
  if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
---- syslog-ng-3.5.2/configure.ac~      2013-12-01 22:52:03.000000000 +0100
-+++ syslog-ng-3.5.2/configure.ac       2013-12-01 23:02:32.955209559 +0100
-@@ -1145,7 +1145,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 $IVYKIS_NO_LIBTOOL_LIBS $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 $IVYKIS_LIBS $DL_LIBS"
--      CORE_DEPS_LIBS=""
-+      CORE_DEPS_LIBS="$GLIB_LIBS $EVTLOG_LIBS $LIBCAP_LIBS $IVYKIS_LIBS"
- 
-       # bypass libtool in case we want to do mixed linking because it
-       # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.