Add libol, missing dependency for syslog-ng

Fix syslog-ng compilation (libol dependency, flex calls)


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3470 3c298f89-4303-0410-b956-a3cf2f4a3e73

8 files changed, 154 insertions, 3 deletions

diff --git a/package/Config.in b/package/Config.in
index 52e6e6aba5..b9c15211d6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -239,6 +239,7 @@ source "package/ncurses/Config.in"  # libncurses
 source "package/libnet/Config.in"
 source "package/libnids/Config.in"
 source "package/libogg/Config.in"
+source "package/libol/Config.in"
 source "package/opencdk/Config.in"  # libopencdk
 source "package/openh323/Config.in" 
 source "package/openldap/Config.in"  # libopenldap
diff --git a/package/Makefile b/package/Makefile
index e2d9b3ad34..5810b3ee5d 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -112,6 +112,7 @@ package-$(BR2_PACKAGE_LIBMAD) += libmad
 package-$(BR2_PACKAGE_LIBNET) += libnet
 package-$(BR2_PACKAGE_LIBNIDS) += libnids
 package-$(BR2_PACKAGE_LIBOGG) += libogg
+package-$(BR2_PACAKGE_LIBOL) += libol
 package-$(BR2_PACKAGE_LIBOSIP2) += libosip2
 package-$(BR2_PACKAGE_LIBPCAP) += libpcap
 package-$(BR2_PACKAGE_LIBPNG) += libpng
@@ -277,7 +278,7 @@ package-$(BR2_PACKAGE_XINETD) += xinetd
 package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant
 package-$(BR2_PACKAGE_ZLIB) += zlib
 
-DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap radiusclient-ng libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib net-snmp
+DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libol libosip2 libpcap radiusclient-ng libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib net-snmp
 DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))
 SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp
 SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))
@@ -391,6 +392,7 @@ socat-compile: openssl-compile
 sqlite-compile: ncurses-compile readline-compile
 sqlite2-compile: ncurses-compile readline-compile
 ssltunnel-compile: openssl-compile ppp-compile
+syslog-ng-compile: libol-compile
 tcpdump-compile: libpcap-compile
 tinc-compile: zlib-compile openssl-compile liblzo-compile
 tor-compile: libevent-compile openssl-compile zlib-compile
diff --git a/package/libol/Config.in b/package/libol/Config.in
new file mode 100644
index 0000000000..3037283f8c
--- /dev/null
+++ b/package/libol/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBOL
+	prompt "libol............................. Support library for syslog-ng"
+	tristate
+	default n 
+	help
+	  Support library for syslog-ng
+
+	  http://www.balabit.com
diff --git a/package/libol/Makefile b/package/libol/Makefile
new file mode 100644
index 0000000000..e614fa2eeb
--- /dev/null
+++ b/package/libol/Makefile
@@ -0,0 +1,85 @@
+# $Id: Makefile 3112 2006-02-01 23:53:19Z mbm $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libol
+PKG_VERSION:=0.3.17
+PKG_RELEASE:=1
+PKG_MD5SUM:=28cc52e84bdb472b7830f9ad120a62a7
+
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/libol/0.3/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,LIBOL,libol,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--enable-shared \
+			--enable-static \
+	)
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	touch $@
+
+$(IPKG_LIBOL):
+	install -d -m0755 $(IDIR_LIBOL)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.so.* $(IDIR_LIBOL)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBOL)
+	$(IPKG_BUILD) $(IDIR_LIBOL) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libol.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libol-config $(STAGING_DIR)/usr/bin/
+	mkdir -p $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libol $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.{*a,so*} $(STAGING_DIR)/usr/lib/
+	touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libol.so
+
+uninstall-dev:
+	rm -rf \
+	  $(STAGING_DIR)/usr/bin/libol-config \
+	  $(STAGING_DIR)/usr/include/libol \
+	  $(STAGING_DIR)/usr/lib/libol.{*a,so*} \
+
+compile-targets: install-dev
+clean-targets: uninstall-dev
+
diff --git a/package/libol/ipkg/libol.control b/package/libol/ipkg/libol.control
new file mode 100644
index 0000000000..c65ae38591
--- /dev/null
+++ b/package/libol/ipkg/libol.control
@@ -0,0 +1,4 @@
+Package: libol
+Section: libs
+Description: Support library for syslog-ng
+Priority: optional
diff --git a/package/syslog-ng/Config.in b/package/syslog-ng/Config.in
index d9fface1eb..726586142a 100644
--- a/package/syslog-ng/Config.in
+++ b/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/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index b97cca360a..081d12024a 100644
--- a/package/syslog-ng/Makefile
+++ b/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/package/syslog-ng/patches/01-no_lfl.patch b/package/syslog-ng/patches/01-no_lfl.patch
new file mode 100644
index 0000000000..e17a5c6af2
--- /dev/null
+++ b/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
+