From: Joshua Kinard <kumba@xxxxxxxxxx>
Remove the configure check for aio.h, which is not provided by uClibc, and
which does not appear to be used by xfsprogs.
Refer to Gentoo Bug #477758:
https://bugs.gentoo.org/show_bug.cgi?id=477758
Signed-off-by: Joshua Kinard <kumba@xxxxxxxxxx>
Reported-by: El Goretto <el.goretto@xxxxxxx>
Suggested-by: Renà RhÃaume <rene.rheaume@xxxxxxxxx>
---
aclocal.m4 | 1 -
configure.ac | 6 +++---
m4/Makefile | 1 -
m4/package_aiodev.m4 | 36 ------------------------------------
4 files changed, 3 insertions(+), 41 deletions(-)
diff -Naurp xfsprogs-4.3.0.orig/aclocal.m4 xfsprogs-4.3.0/aclocal.m4
--- xfsprogs-4.3.0.orig/aclocal.m4 2015-11-23 04:30:01.000000000 +0000
+++ xfsprogs-4.3.0/aclocal.m4 2016-01-01 10:47:09.492229000 +0000
@@ -19,7 +19,6 @@ m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
m4_include([m4/manual_format.m4])
m4_include([m4/multilib.m4])
-m4_include([m4/package_aiodev.m4])
m4_include([m4/package_blkid.m4])
m4_include([m4/package_globals.m4])
m4_include([m4/package_libcdev.m4])
diff -Naurp xfsprogs-4.3.0.orig/configure.ac xfsprogs-4.3.0/configure.ac
--- xfsprogs-4.3.0.orig/configure.ac 2015-11-23 04:24:24.000000000 +0000
+++ xfsprogs-4.3.0/configure.ac 2016-01-01 10:47:09.502229000 +0000
@@ -56,6 +56,9 @@ AC_ARG_ENABLE(lib64,
enable_lib64=yes)
AC_SUBST(enable_lib64)
+librt="-lrt"
+AC_SUBST(librt)
+
#
# If the user specified a libdir ending in lib64 do not append another
# 64 to the library names.
@@ -101,9 +104,6 @@ AC_PACKAGE_GLOBALS(xfsprogs)
AC_PACKAGE_UTILITIES(xfsprogs)
AC_MULTILIB($enable_lib64)
-AC_PACKAGE_NEED_AIO_H
-AC_PACKAGE_NEED_LIO_LISTIO
-
AC_PACKAGE_NEED_UUID_H
AC_PACKAGE_NEED_UUIDCOMPARE
diff -Naurp xfsprogs-4.3.0.orig/m4/Makefile xfsprogs-4.3.0/m4/Makefile
--- xfsprogs-4.3.0.orig/m4/Makefile 2010-01-15 00:27:10.000000000 +0000
+++ xfsprogs-4.3.0/m4/Makefile 2016-01-01 10:47:09.502229000 +0000
@@ -14,7 +14,6 @@ CONFIGURE = \
LSRCFILES = \
manual_format.m4 \
- package_aiodev.m4 \
package_blkid.m4 \
package_globals.m4 \
package_libcdev.m4 \
diff -Naurp xfsprogs-4.3.0.orig/m4/package_aiodev.m4
xfsprogs-4.3.0/m4/package_aiodev.m4
--- xfsprogs-4.3.0.orig/m4/package_aiodev.m4 2010-06-24 22:23:27.000000000
+0000
+++ xfsprogs-4.3.0/m4/package_aiodev.m4 2016-01-01 10:47:09.502229000 +0000
@@ -1,37 +1 @@
-#
-# Check if we have a libaio.h installed
-#
-AC_DEFUN([AC_PACKAGE_WANT_AIO],
- [ AC_CHECK_HEADERS(libaio.h, [ have_aio=true ], [ have_aio=false ])
- AC_SUBST(have_aio)
- ])
-
-#
-# Check if we have an aio.h installed
-#
-AC_DEFUN([AC_PACKAGE_NEED_AIO_H],
- [ AC_CHECK_HEADERS(aio.h)
- if test $ac_cv_header_aio_h = no; then
- echo
- echo 'FATAL ERROR: could not find a valid <aio.h> header.'
- exit 1
- fi
- ])
-
-#
-# Check if we have the lio_listio routine in either libc/librt
-#
-AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
- [ AC_CHECK_FUNCS(lio_listio)
- if test $ac_cv_func_lio_listio = yes; then
- librt=""
- else
- AC_CHECK_LIB(rt, lio_listio,, [
- echo
- echo 'FATAL ERROR: could not find a library with lio_listio.'
- exit 1],[-lpthread])
- librt="-lrt"
- fi
- AC_SUBST(librt)
- ])
|