diff options
| author | Eryu Guan <eguan@redhat.com> | 2016-02-29 10:19:05 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-02-29 10:19:05 +1100 |
| commit | 219077fcb8086e5b38521b4209d34fdba79345ce (patch) | |
| tree | 750d6a1847b00b373f517122bca3be36f2ea220e /m4 | |
| parent | 40d2678b7b5dfd7779fb87878dd24b2e7797b780 (diff) | |
fstests: update autoconf rules to define _GNU_SOURCE where needed
Starting from xfsprogs commit cb898f157f84 ("linux.h: Use off64_t
instead of loff_t") in v4.5-rc1, fstests failed to build because of
configure error:
checking xfs/xfs.h usability... no
checking xfs/xfs.h presence... yes
configure: WARNING: xfs/xfs.h: present but cannot be compiled
configure: WARNING: xfs/xfs.h: check for missing prerequisite headers?
configure: WARNING: xfs/xfs.h: see the Autoconf documentation
configure: WARNING: xfs/xfs.h: section "Present But Cannot Be Compiled"
configure: WARNING: xfs/xfs.h: proceeding with the compiler's result
checking for xfs/xfs.h... no
FATAL ERROR: cannot find a valid <xfs/xfs.h> header file.
Run "make install-qa" from the xfsprogs source.
and that's because off64_t is not defined without _GNU_SOURCE being set.
Fix it by updating the autoconf rules adding _GNU_SOURCE define for the
following checks:
xfs.h libxfs.h xfs_log_format.h xlog_assign_lsn xqm.h xfsctl
Suggested-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/package_xfslibs.m4 | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4 index 78a3dc47..6bf47040 100644 --- a/m4/package_xfslibs.m4 +++ b/m4/package_xfslibs.m4 @@ -1,27 +1,29 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H], - [ AC_CHECK_HEADERS([xfs/xfs.h]) + [ AC_CHECK_HEADERS([xfs/xfs.h],,,[#define _GNU_SOURCE]) if test "$ac_cv_header_xfs_xfs_h" != "yes"; then echo echo 'FATAL ERROR: cannot find a valid <xfs/xfs.h> header file.' - echo 'Run "make install-qa" from the xfsprogs source.' + echo 'Run "make install-dev" from the xfsprogs source.' exit 1 fi ]) AC_DEFUN([AC_PACKAGE_WANT_LIBXFS_H], - [ AC_CHECK_HEADERS([xfs/libxfs.h], [ have_libxfs=true ], [ have_libxfs=false ]) + [ AC_CHECK_HEADERS([xfs/libxfs.h], [ have_libxfs=true ], + [ have_libxfs=false ], [#define _GNU_SOURCE]) AC_SUBST(have_libxfs) ]) AC_DEFUN([AC_PACKAGE_WANT_XLOG_ASSIGN_LSN], [ AC_CHECK_DECL(xlog_assign_lsn, - [ have_xlog_assign_lsn=true ], [ have_xlog_assign_lsn=false ], - [[#include <xfs/libxfs.h>]]) + [ have_xlog_assign_lsn=true ], [ have_xlog_assign_lsn=false ], [[ +#define _GNU_SOURCE +#include <xfs/libxfs.h>]]) AC_SUBST(have_xlog_assign_lsn) ]) AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H], - [ AC_CHECK_HEADERS([xfs/xqm.h]) + [ AC_CHECK_HEADERS([xfs/xqm.h],,,[#define _GNU_SOURCE]) if test "$ac_cv_header_xfs_xqm_h" != "yes"; then echo echo 'FATAL ERROR: cannot find a valid <xfs/xqm.h> header file.' @@ -99,7 +101,10 @@ AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE], AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO], [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h]) - AC_TRY_LINK([#include <xfs/xfs.h>], [ int x = xfsctl(0, 0, 0, 0); ], + AC_TRY_LINK([ +#define _GNU_SOURCE +#include <xfs/xfs.h> ], + [ int x = xfsctl(0, 0, 0, 0); ], [ echo ok ], [ echo echo 'FATAL ERROR: cannot find required macros in the XFS headers.' |