| Message ID | 1352028912-23845-1-git-send-email-gustavo@zacarias.com.ar |
|---|---|
| State | Accepted |
| Commit | 3da67a081e55431f7b0cfae850a3f6851ff39409 |
| Headers | show |
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Fix Peter's reported build failure:
Gustavo> http://autobuild.buildroot.net/results/1dcf63799937f2216e3c712af8880ad431dbd47c/build-end.log
Gustavo> This is because the configure script uses absolute paths to detect dbi,
Gustavo> mysql and pgsql, so forcibly disable them.
Gustavo> Also add the optional sqlite dependency when it's selected.
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/ulogd/ulogd.mk | 3 ++-
Gustavo> 1 files changed, 2 insertions(+), 1 deletions(-)
Gustavo> diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
Gustavo> index 7d31b73..4620bbd 100644
Gustavo> --- a/package/ulogd/ulogd.mk
Gustavo> +++ b/package/ulogd/ulogd.mk
Gustavo> @@ -7,10 +7,11 @@
Gustavo> ULOGD_VERSION = 2.0.1
Gustavo> ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
Gustavo> ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
Gustavo> +ULOGD_CONF_OPT = --with-dbi=no --with-mysql=no --with-pgsql=no
We do have mysql_client though - Any reason to not build support for it
if enabled?
On 11/04/12 09:06, Peter Korsgaard wrote: > We do have mysql_client though - Any reason to not build support for it > if enabled? I'm still running a fever from flu and i don't have the necessary brain power to test it right at this moment :) Regards.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: Gustavo> On 11/04/12 09:06, Peter Korsgaard wrote: >> We do have mysql_client though - Any reason to not build support for it >> if enabled? Gustavo> I'm still running a fever from flu and i don't have the Gustavo> necessary brain power to test it right at this moment :) Fair enough, I'll leave it for now then - Committed, thanks.
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 7d31b73..4620bbd 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -7,10 +7,11 @@ ULOGD_VERSION = 2.0.1 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files +ULOGD_CONF_OPT = --with-dbi=no --with-mysql=no --with-pgsql=no ULOGD_AUTORECONF = YES ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ - libnfnetlink + libnfnetlink $(if $(BR2_PACKAGE_SQLITE),sqlite) ULOGD_LICENSE = GPLv2 ULOGD_LICENSE_FILES = COPYING
Fix Peter's reported build failure: http://autobuild.buildroot.net/results/1dcf63799937f2216e3c712af8880ad431dbd47c/build-end.log This is because the configure script uses absolute paths to detect dbi, mysql and pgsql, so forcibly disable them. Also add the optional sqlite dependency when it's selected. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/ulogd/ulogd.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)