f56e74ef56
Merge topic 'hpux-libarchive-compile'
...
c1ddd77d
2014-06-09 10:36:13 -04:00
c1ddd77d0c
libarchive: Fix compilation on Tru64 with F_SETTIMES
...
The parent commit left a typo in the conditional code path for Tru64.
Add the missing '.'.
2014-06-09 10:36:41 -04:00
8c29d8d1e7
Merge topic 'hpux-libarchive-compile'
...
478b1c8b
2014-06-09 10:28:40 -04:00
478b1c8b36
libarchive: fix compilation on newer HP-UX versions
...
Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different
struct for the timing information.
Suggested-by: Eric Berge <ericmberge@gmail.com>
2014-06-09 10:15:27 -04:00
4533560c23
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
2014-04-15 16:34:50 -04:00
677384017a
libarchive: Include cm_zlib.h to get zlib used by CMake
...
Follow up change from commit ffa6faa4
2013-07-31 08:19:58 -04:00
102071f80c
Merge branch 'libarchive-upstream' into update-libarchive
...
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
2013-07-31 08:19:13 -04:00
3e5a80f063
Merge branch 'libarchive-upstream' into update-libarchive
...
Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950
snapshot.
2011-12-20 11:54:25 -05:00
Brad King
Rolf Eike Beer