kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'linux-standard-base' 

ee55a4f libarchive: Use OpenSSL only if CMAKE_USE_OPENSSL (#11815)
41b7b3e libarchive: Define major/minor/makedev only where needed (#11648)
This commit is contained in:
Brad King 2011-02-14 16:34:11 -05:00 committed by CMake Topic Stage
parent 2a2fca24aa ee55a4f709
commit 42a5e8d978
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Utilities/cmlibarchive/CMakeLists.txt
View File

@ -274,7 +274,11 @@ LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
# #
# Find OpenSSL # Find OpenSSL
# #
FIND_PACKAGE(OpenSSL) IF(CMAKE_USE_OPENSSL)
FIND_PACKAGE(OpenSSL)
ELSE()
SET(OPENSSL_FOUND 0)
ENDIF()
IF(OPENSSL_FOUND) IF(OPENSSL_FOUND)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
@ -296,7 +300,11 @@ LA_CHECK_INCLUDE_FILE("sha256.h" HAVE_SHA256_H)
# #
# Find MD5/RMD160/SHA library # Find MD5/RMD160/SHA library
# #
FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto) IF(CMAKE_USE_OPENSSL)
FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto)
ELSE()
SET(CRYPTO_LIBRARY "")
ENDIF()
IF(CRYPTO_LIBRARY) IF(CRYPTO_LIBRARY)
LIST(APPEND ADDITIONAL_LIBS ${CRYPTO_LIBRARY}) LIST(APPEND ADDITIONAL_LIBS ${CRYPTO_LIBRARY})
ELSE(CRYPTO_LIBRARY) ELSE(CRYPTO_LIBRARY)

15
Utilities/cmlibarchive/libarchive/archive_entry.c
View File

@ -32,12 +32,12 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.55 2008/12/23 05:01:4
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#ifdef MAJOR_IN_MKDEV #if MAJOR_IN_MKDEV
#include <sys/mkdev.h> #include <sys/mkdev.h>
#else #define HAVE_MAJOR
#ifdef MAJOR_IN_SYSMACROS #elif MAJOR_IN_SYSMACROS
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#endif #define HAVE_MAJOR
#endif #endif
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
@ -75,6 +75,13 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.55 2008/12/23 05:01:4
#undef max #undef max
#define max(a, b) ((a)>(b)?(a):(b)) #define max(a, b) ((a)>(b)?(a):(b))
#if !defined(HAVE_MAJOR) && !defined(major)
/* Replacement for major/minor/makedev. */
#define major(x) ((int)(0x00ff & ((x) >> 8)))
#define minor(x) ((int)(0xffff00ff & (x)))
#define makedev(maj,min) ((0xff00 & ((maj)<<8)) | (0xffff00ff & (min)))
#endif
/* Play games to come up with a suitable makedev() definition. */ /* Play games to come up with a suitable makedev() definition. */
#ifdef __QNXNTO__ #ifdef __QNXNTO__
/* QNX. <sigh> */ /* QNX. <sigh> */

7
Utilities/cmlibarchive/libarchive/archive_entry_xattr.c
View File

@ -32,13 +32,6 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.55 2008/12/23 05:01:4
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#ifdef MAJOR_IN_MKDEV
#include <sys/mkdev.h>
#else
#ifdef MAJOR_IN_SYSMACROS
#include <sys/sysmacros.h>
#endif
#endif
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif

5
Utilities/cmlibarchive/libarchive/archive_windows.h
View File

@ -94,11 +94,6 @@
#endif #endif
#endif #endif
/* Replacement for major/minor/makedev. */
#define major(x) ((int)(0x00ff & ((x) >> 8)))
#define minor(x) ((int)(0xffff00ff & (x)))
#define makedev(maj,min) ((0xff00 & ((maj)<<8))|(0xffff00ff & (min)))
/* Alias the Windows _function to the POSIX equivalent. */ /* Alias the Windows _function to the POSIX equivalent. */
#define access _access #define access _access
#define chdir __la_chdir #define chdir __la_chdir