libarchive: Remove unused STDC_HEADERS try_run
This was the only try_run() in libarchive, and the result was not used in the source code. We remove it to allow cross-compiling to work.
This commit is contained in:
Brad King
parent
c9235c0159
commit
8b2f6dbfa2
|
|
@ -62,7 +62,6 @@ INCLUDE(CheckCSourceRuns)
|
|||
INCLUDE(CheckFileOffsetBits)
|
||||
INCLUDE(CheckFuncs)
|
||||
INCLUDE(CheckHeaderDirent)
|
||||
INCLUDE(CheckHeaderSTDC)
|
||||
INCLUDE(CheckIncludeFile)
|
||||
INCLUDE(CheckIncludeFiles)
|
||||
INCLUDE(CheckLibraryExists)
|
||||
|
|
@ -207,7 +206,6 @@ ENDIF(LZMA_FOUND)
|
|||
#
|
||||
# Check headers
|
||||
#
|
||||
CHECK_HEADER_STDC()
|
||||
CHECK_HEADER_DIRENT()
|
||||
|
||||
SET(INCLUDES "")
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
||||
#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
||||
#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 256; i++) {
|
||||
if (XOR(islower(i), ISLOWER(i)) || toupper(i) != TOUPPER(i))
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
#
|
||||
# - Check if the system has the ANSI C files
|
||||
# CHECK_HEADER_STDC
|
||||
#
|
||||
# The following variables may be set before calling this macro to
|
||||
# modify the way the check is run:
|
||||
#
|
||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
||||
# Copyright (c) 2009, Michihiro NAKAJIMA
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
|
||||
MACRO (CHECK_HEADER_STDC)
|
||||
IF(NOT DEFINED STDC_HEADERS)
|
||||
IF(CMAKE_REQUIRED_INCLUDES)
|
||||
SET(CHECK_HEADER_STDC_C_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")
|
||||
ELSE(CMAKE_REQUIRED_INCLUDES)
|
||||
SET(CHECK_HEADER_STDC_C_INCLUDE_DIRS)
|
||||
ENDIF(CMAKE_REQUIRED_INCLUDES)
|
||||
SET(MACRO_CHECK_HEADER_STDC_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
||||
|
||||
MESSAGE(STATUS "Cheking for ANSI C header files")
|
||||
TRY_RUN(CHECK_HEADER_STDC_result
|
||||
CHECK_HEADER_STDC_compile_result
|
||||
${CMAKE_BINARY_DIR}
|
||||
${libarchive_SOURCE_DIR}/build/cmake/CheckHeaderSTDC.c
|
||||
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
|
||||
CMAKE_FLAGS
|
||||
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_HEADER_STDC_FLAGS}
|
||||
"${CHECK_HEADER_STDC_C_INCLUDE_DIRS}"
|
||||
OUTPUT_VARIABLE OUTPUT)
|
||||
|
||||
IF(CHECK_HEADER_STDC_compile_result AND CHECK_HEADER_STDC_result EQUAL 0)
|
||||
FIND_PATH(CHECK_HEADER_STDC_path "string.h")
|
||||
IF (CHECK_HEADER_STDC_path)
|
||||
FILE(STRINGS "${CHECK_HEADER_STDC_path}/string.h" CHECK_HEADER_STDC_result REGEX "[^a-zA-Z_]memchr[^a-zA-Z_]")
|
||||
IF (CHECK_HEADER_STDC_result)
|
||||
FILE(STRINGS "${CHECK_HEADER_STDC_path}/stdlib.h" CHECK_HEADER_STDC_result REGEX "[^a-zA-Z_]free[^a-zA-Z_]")
|
||||
ENDIF (CHECK_HEADER_STDC_result)
|
||||
ENDIF (CHECK_HEADER_STDC_path)
|
||||
ENDIF(CHECK_HEADER_STDC_compile_result AND CHECK_HEADER_STDC_result EQUAL 0)
|
||||
|
||||
IF(CHECK_HEADER_STDC_result)
|
||||
MESSAGE(STATUS "Cheking for ANSI C header files - found")
|
||||
SET(STDC_HEADERS 1 CACHE INTERNAL "Have ANSI C headers")
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
|
||||
"Determining if the include file ${INCLUDE} "
|
||||
"exists passed with the following output:\n"
|
||||
"${OUTPUT}\n\n")
|
||||
ELSE(CHECK_HEADER_STDC_result)
|
||||
MESSAGE(STATUS "Cheking for ANSI C header files - not found")
|
||||
SET(STDC_HEADERS "" CACHE INTERNAL "Have ANSI C headers")
|
||||
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
|
||||
"Determining if the include file ${INCLUDE} "
|
||||
"exists failed with the following output:\n"
|
||||
"${OUTPUT}\n\n")
|
||||
ENDIF(CHECK_HEADER_STDC_result)
|
||||
|
||||
ENDIF(NOT DEFINED STDC_HEADERS)
|
||||
ENDMACRO (CHECK_HEADER_STDC)
|
||||
|
||||
|
|
@ -620,9 +620,6 @@
|
|||
/* The size of `wchar_t', as computed by sizeof. */
|
||||
#cmakedefine SIZEOF_WCHAR_T ${SIZEOF_WCHAR_T}
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#cmakedefine STDC_HEADERS 1
|
||||
|
||||
/* Define to 1 if strerror_r returns char *. */
|
||||
#cmakedefine STRERROR_R_CHAR_P 1
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,6 @@
|
|||
#define HAVE_WMEMCMP 1
|
||||
#define HAVE_WMEMCPY 1
|
||||
#define HAVE_ZLIB_H 1
|
||||
#define STDC_HEADERS 1
|
||||
#define TIME_WITH_SYS_TIME 1
|
||||
|
||||
/* FreeBSD 4 and earlier lack intmax_t/uintmax_t */
|
||||
|
|
|
|||
|
|
@ -465,9 +465,6 @@
|
|||
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
|
||||
/* #undef NO_MINUS_C_MINUS_O */
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Define to 1 if strerror_r returns char *. */
|
||||
/* #undef STRERROR_R_CHAR_P */
|
||||
|
||||
|
|
|
|||
|
|
@ -81,4 +81,3 @@
|
|||
#define HAVE_WCTYPE_H 1
|
||||
#define HAVE_ZLIB_H 1
|
||||
#undef MAJOR_IN_MKDEV
|
||||
#define STDC_HEADERS 1
|
||||
|
|
|
|||
Loading…
Reference in New Issue