aboutsummaryrefslogtreecommitdiff
path: root/ports/libarchive
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-12-21 11:34:24 -0800
committerGitHub <noreply@github.com>2019-12-21 11:34:24 -0800
commit59b28867dc36d20652116026d4e113fe947402db (patch)
tree06253ecb55db12805cd79d1171b3676e824d04ec /ports/libarchive
parent37265f7a45489d065ed02891cbfd2becb741712b (diff)
downloadvcpkg-59b28867dc36d20652116026d4e113fe947402db.tar.gz
vcpkg-59b28867dc36d20652116026d4e113fe947402db.zip
[vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux (#9411)
* [libarchive] Fix cpu_set_t missing * [xalan-c] Fix flakiness in presense of ICU * [openvpn3] Add missing bits/endian.h include * [vcpkg-baseline] Mark vtk as no longer failing
Diffstat (limited to 'ports/libarchive')
-rw-r--r--ports/libarchive/CONTROL2
-rw-r--r--ports/libarchive/fix-cpu-set.patch15
-rw-r--r--ports/libarchive/portfile.cmake1
3 files changed, 17 insertions, 1 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index 19bee0af1..907e50745 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,5 +1,5 @@
Source: libarchive
-Version: 3.4.0-1
+Version: 3.4.0-2
Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib
diff --git a/ports/libarchive/fix-cpu-set.patch b/ports/libarchive/fix-cpu-set.patch
new file mode 100644
index 000000000..8d1924dbe
--- /dev/null
+++ b/ports/libarchive/fix-cpu-set.patch
@@ -0,0 +1,15 @@
+diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c
+index 65ea691..63217ec 100644
+--- a/libarchive/archive_random.c
++++ b/libarchive/archive_random.c
+@@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$");
+ #include <sys/time.h>
+ #endif
+ #ifdef HAVE_PTHREAD_H
++#ifdef __GNUC__
++#define _GNU_SOURCE
++#include <sched.h>
++#endif
+ #include <pthread.h>
+ #endif
+
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index 3b69a69b9..61d1dfd4a 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
fix-dependencies.patch
fix-lz4.patch
fix-zstd.patch
+ fix-cpu-set.patch
)
set(BUILD_libarchive_bzip2 OFF)