[package] fix urbi compilation failure on octeon (#6987)

[openwrt/svn-archive/archive.git] / admin / syslog-ng3 / Makefile

diff --git a/admin/syslog-ng3/Makefile b/admin/syslog-ng3/Makefile
index dcb92d808c37881e8f041ae4312fe8fe349867a7..a6192291df6464f6b42df81af119b8bedb0379f3 100644 (file)
--- a/admin/syslog-ng3/Makefile
+++ b/admin/syslog-ng3/Makefile
@@ -8,12 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
-PKG_VERSION:=3.0.4
+PKG_VERSION:=3.0.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=86c39779261545d2289e9c309e262b8d
+PKG_MD5SUM:=28f0d9ff2243b330e8cd6311ef9b2f12
 
-PKG_SOURCE_URL:= \
-       http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.0.4/source/
+PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(PKG_VERSION)/source/
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
@@ -37,17 +36,29 @@ define Package/syslog-ng3/conffiles
 endef
 
 define Build/Configure
-       $(call Build/Configure/Default, \
-               --disable-dependency-tracking \
-               --enable-tcp-wrapper \
-               --disable-glibtest \
-               , \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include/eventlog $(TARGET_CPPFLAGS)" \
-               LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
-               PKG_CONFIG="$(STAGING_DIR_HOST)/bin/pkg-config" \
-       )
+       $(SED) 's,-I/usr/include,,' $(PKG_BUILD_DIR)/configure
+       $(Build/Configure/Default)
 endef
 
+CONFIGURE_ARGS +=  \
+       --disable-dependency-tracking \
+       --enable-tcp-wrapper \
+       --disable-glibtest \
+       --disable-spoof-source \
+       --disable-sql \
+       --enable-prce \
+       --disable-linux-caps \
+
+TARGET_CPPFLAGS += \
+       -I$(STAGING_DIR)/usr/include/eventlog
+
+TARGET_LDFLAGS += \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+
+CONFIGURE_VARS += \
+       LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include"
+
 define Package/syslog-ng3/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/syslog-ng $(1)/usr/sbin/