| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
* upstream-LibArchive:
LibArchive 2016-06-19 (139d0576)
|
| |
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
| |
|
|
| |
Resolve conflicts by integrating changes from both sides.
|
| |
|
|
|
| |
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
|
| |
|
|
|
|
| |
Resolve conflicts in favor of the upstream side where possible.
Resolve a logical conflict in archive_windows.h where the upstream
port to Watcom was done slightly differently from ours.
|
| |
|
|
|
|
| |
Since commit 7d47c693 (Drop compatibility with CMake < 2.4, 2013-10-08)
we no longer need to use the configure_file IMMEDIATE option to support
compatibility modes less than 2.0.
|
| |
|
|
|
|
|
| |
Avoid requiring CMake 2.8.6 for CMakePushCheckState or CMake 2.8.8 for
CMakeExpandImportedTargets. Drop the custom versions of CMake modules
CheckCSource(Compiles|Runs) because we do not use the SAFESEH option
anyway.
|
| |
|
|
|
|
|
|
|
|
|
| |
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive.h
Utilities/cmlibarchive/libarchive/archive_entry.h
Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c
Utilities/cmlibarchive/libarchive/archive_windows.h
Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
|
| |
|
|
|
|
| |
Conflicts:
Utilities/cmlibarchive/CMakeLists.txt
Utilities/cmlibarchive/libarchive/archive_windows.c
|
| |
|
|
|
| |
Some Linux API versions do not perform this inclusion automatically,
so types like __u64 needed by the latter are not available.
|
| |
|
|
|
|
| |
Configure the result as definition HAVE_STRUCT_STATVFS_F_IOSIZE and use
the member only if it exists. At least one platform (IRIX) provides
struct statvfs without this member.
|
| |
|
|
|
| |
Replay commit 41719b75 (fix typo in CheckFileOffsetBits.cmake,
2011-10-05) after import of new libarchive snapshot.
|
| |
|
|
|
|
|
|
|
| |
Make changes equivalent to those originally made by commits
bd56626a (Fixes for the OSF operating system build, 2010-09-08)
92c082b1 (Add a fix for the inline keyword on the osf os, 2010-09-10)
but based on the updated libarchive snapshot.
|
| |
|
|
|
| |
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
|
| | |
|
| |
|
|
| |
s/Cheking/Checking/
|
| |
|
|
| |
The directory contains some files with unclear licensing anyway.
|
| | |
|
| |
|
|
|
| |
The libarchive source does not use HAVE_PRINTF_JD or HAVE_PRINTF_LLD, so
we do not need to test for them at configuration time.
|
| |
|
|
|
| |
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.
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
Some versions of Borland provide <stdint.h>, so we use it when possible.
However, the 64-bit signed and unsigned integer min/max constants cause
overflow warnings from Borland itself! For these constants we fall back
on our default definitions.
|
| |
|
|
| |
vs70 again too.
|
|
|
This allows for a built in bzip and zip capability, so external tools
will not be needed for these packagers. The cmake -E tar xf should be
able to handle all compression types now as well.
|
