diff options
| author | Alexandr Reshetnikov <hemnstill@users.noreply.github.com> | 2022-06-19 23:10:18 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-19 23:10:18 +0400 |
| commit | 3db548220451a2d239699cd655c183a0c8def5af (patch) | |
| tree | 842acb9f8c62dbf54e54b2da6ae749cb6fe6f3fa | |
| parent | 294481949d4aa801a5082ed819c53d5c5331c58a (diff) | |
| parent | 12b9856a44454d6e710a3c691c0f5049f356ecba (diff) | |
| download | libarchive-3db548220451a2d239699cd655c183a0c8def5af.tar.gz | |
Merge branch 'libarchive:master' into zstd_windows
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | libarchive/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libarchive/archive_platform.h | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index f882d145..e53133da 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,11 +10,9 @@ FreeBSD_task: BS: cmake matrix: freebsd_instance: - image_family: freebsd-13-0 + image_family: freebsd-13-1 freebsd_instance: - image_family: freebsd-12-2 - freebsd_instance: - image_family: freebsd-11-4 + image_family: freebsd-12-3 prepare_script: - ./build/ci/cirrus_ci/ci.sh prepare configure_script: diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt index e1d76a51..44895ce3 100644 --- a/libarchive/CMakeLists.txt +++ b/libarchive/CMakeLists.txt @@ -5,6 +5,10 @@ # ############################################ +if (ANDROID) + include_directories(${PROJECT_SOURCE_DIR}/contrib/android/include) +endif() + # Public headers SET(include_HEADERS archive.h diff --git a/libarchive/archive_platform.h b/libarchive/archive_platform.h index 3426975d..1038932a 100644 --- a/libarchive/archive_platform.h +++ b/libarchive/archive_platform.h @@ -195,8 +195,9 @@ /* * glibc 2.24 deprecates readdir_r + * bionic c deprecates readdir_r too */ -#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) +#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) && (!defined(__ANDROID__)) #define USE_READDIR_R 1 #else #undef USE_READDIR_R |