summaryrefslogtreecommitdiffstats
path: root/openwrt/package/syslog-ng
diff options
context:
space:
mode:
Diffstat (limited to 'openwrt/package/syslog-ng')
-rw-r--r--openwrt/package/syslog-ng/Config.in3
-rw-r--r--openwrt/package/syslog-ng/Makefile2
-rw-r--r--openwrt/package/syslog-ng/patches/01-no_lfl.patch50
3 files changed, 53 insertions, 2 deletions
diff --git a/openwrt/package/syslog-ng/Config.in b/openwrt/package/syslog-ng/Config.in
index d9fface1e..726586142 100644
--- a/openwrt/package/syslog-ng/Config.in
+++ b/openwrt/package/syslog-ng/Config.in
@@ -1,7 +1,8 @@
config BR2_PACKAGE_SYSLOG_NG
prompt "syslog-ng......................... A powerful syslog daemon"
tristate
- default n
+ default m if CONFIG_DEVEL
+ select BR2_PACKAGE_LIBOL
help
syslog-ng reads and logs messages to the system console, log
files, other machines and/or users as specified by its
diff --git a/openwrt/package/syslog-ng/Makefile b/openwrt/package/syslog-ng/Makefile
index b97cca360..081d12024 100644
--- a/openwrt/package/syslog-ng/Makefile
+++ b/openwrt/package/syslog-ng/Makefile
@@ -61,7 +61,7 @@ $(PKG_BUILD_DIR)/.built:
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
CC=$(TARGET_CC) \
- all install
+ install-exec install-data
touch $@
$(IPKG_SYSLOG_NG):
diff --git a/openwrt/package/syslog-ng/patches/01-no_lfl.patch b/openwrt/package/syslog-ng/patches/01-no_lfl.patch
new file mode 100644
index 000000000..e17a5c6af
--- /dev/null
+++ b/openwrt/package/syslog-ng/patches/01-no_lfl.patch
@@ -0,0 +1,50 @@
+diff -urN syslog-ng-1.6.9/Makefile.in syslog-ng-1.6.9.new/Makefile.in
+--- syslog-ng-1.6.9/Makefile.in 2005-11-23 09:58:28.000000000 +0100
++++ syslog-ng-1.6.9.new/Makefile.in 2006-03-23 19:02:04.000000000 +0100
+@@ -64,7 +64,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+-LEXLIB = @LEXLIB@
++LEXLIB =
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+ LIBOL_DIR = @LIBOL_DIR@
+diff -urN syslog-ng-1.6.9/configure syslog-ng-1.6.9.new/configure
+--- syslog-ng-1.6.9/configure 2005-11-23 09:58:29.000000000 +0100
++++ syslog-ng-1.6.9.new/configure 2006-03-23 21:56:43.000000000 +0100
+@@ -3160,7 +3160,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfl $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+diff -urN syslog-ng-1.6.9/src/Makefile.in syslog-ng-1.6.9.new/src/Makefile.in
+--- syslog-ng-1.6.9/src/Makefile.in 2005-11-23 09:58:37.000000000 +0100
++++ syslog-ng-1.6.9.new/src/Makefile.in 2006-03-23 19:02:27.000000000 +0100
+@@ -64,7 +64,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+-LEXLIB = @LEXLIB@
++LEXLIB =
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+ LIBOL_DIR = @LIBOL_DIR@
+diff -urN syslog-ng-1.6.9/src/cfg-lex.c syslog-ng-1.6.9.new/src/cfg-lex.c
+--- syslog-ng-1.6.9/src/cfg-lex.c 2005-11-15 19:41:46.000000000 +0100
++++ syslog-ng-1.6.9.new/src/cfg-lex.c 2006-03-23 19:03:25.000000000 +0100
+@@ -666,7 +666,9 @@
+ #ifdef __cplusplus
+ extern "C" int yywrap (void );
+ #else
+-extern int yywrap (void );
++int yywrap (void ) {
++ return 1;
++}
+ #endif
+ #endif
+