Revert "Only build bundled fts if system has a bad version that doesn't handle LFS"

The subtle test is too subtle for its own good, this patch breaks
thirty six testcases on 32bit architectures.

This reverts commit 1eadabe445.
This commit is contained in:
Panu Matilainen 2017-08-10 20:15:02 +03:00
parent 03a905c94c
commit 7e65bec67d
3 changed files with 2 additions and 22 deletions

View File

@ -28,16 +28,7 @@
#include <rpm/rpmbase64.h>
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
#ifdef HAVE_FTS_H
# include <fts.h>
# define Fts_open fts_open
# define Fts_read fts_read
# define Fts_close fts_close
#else
# include "misc/rpmfts.h"
#endif
#include "misc/rpmfts.h"
#include "lib/rpmfi_internal.h" /* XXX fi->apath */
#include "lib/rpmug.h"
#include "build/rpmbuild_internal.h"

View File

@ -759,14 +759,6 @@ AC_CHECK_FUNCS(
[mkstemp getcwd basename dirname realpath setenv unsetenv regcomp lchown utimes],
[], [AC_MSG_ERROR([function required by rpm])])
# This is fairly subtle: old non-LFS compatible FTS implementations have an
# explicit check against -D_FILE_OFFSET_BIT S == 64, which has been set
# by our call to AC_SYS_LARGEFILE for systems that need it. So the apparent
# existence check ends up testing for LFS compatibility as well.
AC_CHECK_HEADERS([fts.h])
AM_CONDITIONAL([USE_BUNDLED_FTS_KLUDGE], [test "$ac_cv_header_fts_h" = no])
AC_LIBOBJ(fnmatch)
dnl check if python is requested

View File

@ -9,8 +9,5 @@ EXTRA_DIST = \
noinst_LTLIBRARIES = libmisc.la
libmisc_la_SOURCES =
if USE_BUNDLED_FTS_KLUDGE
libmisc_la_SOURCES += fts.c rpmfts.h
endif
libmisc_la_SOURCES = fts.c rpmfts.h
libmisc_la_LIBADD = @LTLIBOBJS@