2013-04-13 20:03:00

by Mike Frysinger

Subject: [PATCH [nfs-utils]] do not fail sqlite check when cross-compiling

If we're cross-compiling, we can't do a runtime test of sqlite,
so just assume that the user has a good enough version rather
than falling over.

Signed-off-by: Mike Frysinger <[email protected]>
---
configure.ac | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3d7ab0a..a594a7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,9 +274,14 @@ if test "$enable_nfsv4" = yes; then
AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]))

- if test "$libsqlite3_cv_is_recent" != "yes" ; then
- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel])
- fi
+ case $libsqlite3_cv_is_recent in
+ yes) ;;
+ unknown)
+ dnl do not fail when cross-compiling
+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
+ *)
+ AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;;
+ esac
fi

else
--
1.8.1.2

2013-04-13 20:03:05

by Mike Frysinger

Subject: [PATCH [nfs-utils]] ignore more generated files

Signed-off-by: Mike Frysinger <[email protected]>
---
.gitignore | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 39853d9..5164637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ aclocal.m4
autom4te.cache
compile
config.guess
-config.log
config.sub
configure
depcomp
@@ -20,6 +19,8 @@ aclocal/ltversion.m4
aclocal/lt~obsolete.m4
# files generated by configure
confdefs.h
+config.cache
+config.log
config.status
conftest
conftest.c
@@ -34,6 +35,7 @@ support/include/stamp-h1
*.o
.libs
lib*.a
+test-driver
tools/rpcgen/rpcgen
tools/rpcdebug/rpcdebug
utils/blkmapd/blkmapd
--
1.8.1.2

2013-04-22 17:19:29

by Steve Dickson

Subject: Re: [PATCH [nfs-utils]] do not fail sqlite check when cross-compiling

On 13/04/13 16:04, Mike Frysinger wrote:
> If we're cross-compiling, we can't do a runtime test of sqlite,
> so just assume that the user has a good enough version rather
> than falling over.
>
> Signed-off-by: Mike Frysinger <[email protected]>
Committed...

steved.

> ---
> configure.ac | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 3d7ab0a..a594a7b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -274,9 +274,14 @@ if test "$enable_nfsv4" = yes; then
> AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
> AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]))
>
> - if test "$libsqlite3_cv_is_recent" != "yes" ; then
> - AC_MSG_ERROR([nfsdcltrack requires sqlite-devel])
> - fi
> + case $libsqlite3_cv_is_recent in
> + yes) ;;
> + unknown)
> + dnl do not fail when cross-compiling
> + AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
> + *)
> + AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;;
> + esac
> fi
>
> else
>

2013-04-22 17:19:39

by Steve Dickson

Subject: Re: [PATCH [nfs-utils]] ignore more generated files

On 13/04/13 16:04, Mike Frysinger wrote:
> Signed-off-by: Mike Frysinger <[email protected]>
Committed...

steved.

> ---
> .gitignore | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/.gitignore b/.gitignore
> index 39853d9..5164637 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -3,7 +3,6 @@ aclocal.m4
> autom4te.cache
> compile
> config.guess
> -config.log
> config.sub
> configure
> depcomp
> @@ -20,6 +19,8 @@ aclocal/ltversion.m4
> aclocal/lt~obsolete.m4
> # files generated by configure
> confdefs.h
> +config.cache
> +config.log
> config.status
> conftest
> conftest.c
> @@ -34,6 +35,7 @@ support/include/stamp-h1
> *.o
> .libs
> lib*.a
> +test-driver
> tools/rpcgen/rpcgen
> tools/rpcdebug/rpcdebug
> utils/blkmapd/blkmapd
>