Author: arekm Date: Wed Feb 23 08:10:28 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix glib detection; properly link syslog-ng.so to glib and eventlog
---- Files affected:
packages/syslog-ng:
syslog-ng-link.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: packages/syslog-ng/syslog-ng-link.patch
diff -u packages/syslog-ng/syslog-ng-link.patch:1.8
packages/syslog-ng/syslog-ng-link.patch:1.9
--- packages/syslog-ng/syslog-ng-link.patch:1.8 Thu Jan 27 13:52:03 2011
+++ packages/syslog-ng/syslog-ng-link.patch Wed Feb 23 09:10:23 2011
@@ -31,3 +31,25 @@
module_LTLIBRARIES = libdbparser.la
libdbparser_la_SOURCES = \
+--- syslog-ng-3.2.2/configure.in~ 2011-02-23 08:46:17.152179679 +0100
++++ syslog-ng-3.2.2/configure.in 2011-02-23 08:53:26.506748469 +0100
+@@ -458,7 +458,7 @@
+ GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)$"
| tr '\n' ' '`
+
+ old_LIBS=$LIBS
+- LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC"
++ LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC -ldl -lrt"
+ AC_CHECK_FUNC(g_hash_table_new, blb_cv_static_glib=yes,
blb_cv_static_glib=no)
+ LIBS=$old_LIBS
+ fi
+--- syslog-ng-3.2.2/configure.in~ 2011-02-23 08:53:58.767670120 +0100
++++ syslog-ng-3.2.2/configure.in 2011-02-23 09:02:25.059826526 +0100
+@@ -675,7 +675,7 @@
+ SYSLOGNG_LINK='$(LINK)'
+ else
+ 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 -lrt "
+- 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 $DL_LIBS -lrt"
+ # bypass libtool in case we want to do mixel linking
+ SYSLOGNG_LINK='$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-o $@'
+ fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng-link.patch?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
