| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2023-09-12 (6468cd1f)
|
| |
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2022-12-09 (ba80276c)
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Compile some third-party libraries with preprocessor definitions that
activate POSIX APIs even when compiler extensions are not enabled.
We already do this in libuv, inherited from the upstream buildsystem.
This extends commit f034b0f663 (CMake compilation: do not use compiler
extensions, 2020-03-14, v3.18.0-rc1~494^2).
Issue: #20454
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
be9ebc104a libarchive: Simplify code selecting CMake-specific build options
4a7a5718c6 libarchive: Update build within CMake after changes in 3.6.0
85cdeefc37 libarchive: include archive_platform.h first in blake2s sources
b3644e460f Merge branch 'upstream-LibArchive' into update-libarchive
5d50940288 LibArchive 2022-02-09 (9147def1)
406503f620 libarchive: Update script to get 3.6.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6988
|
| |
| |
| |
| |
| | |
Reduce differences from upstream libarchive `CMakeLists.txt` code.
Remove modifications inside code we disable anyway.
|
| | |
|
| |
| |
| |
| |
| | |
* upstream-LibArchive:
LibArchive 2022-02-09 (9147def1)
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
libarchive's crypto library checks use its `config.h` inside the
`try_compile` project. Since commit ade3b16e63 (libarchive: Use KWIML
to get fixed-size integer types, 2020-06-01, v3.18.0-rc1~33^2),
that header depends on KWIML inside CMake. Add the include directory
for KWIML to the crypto library checks. Otherwise, they always fail
due to not finding the KWIML headers, and libarchive decides not
to link the crypto library.
libarchive has other code besides the hash algorithms that depends on
the crypto library if its ENABLE_OPENSSL option is enabled (which in
CMake is controlled by CMAKE_USE_OPENSSL). It seems to be missing some
conditions to link the crypto library in those cases, and instead relies
on at least one of the above-mentioned checks to pass. If they all
fail, and we are using system curl, we might not link the crypto
library.
Fixes: #23234
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Divert LCC compiler as a new one, instead of treating it as GNU.
Since old times, Elbrus C/C++/Fortran Compiler (LCC) by MCST has been
passing checks for GNU compilers, so it has been identified as GNU.
Now, with intent of seriously upstreaming its support, it has been
added as a separate LCC compiler, and its version displays not a
supported GCC version, but LCC version itself (e.g. LCC 1.25.19 instead
of GNU 7.3.0).
This commit adds its support for detection, and also converts basically
every check like 'is this compiler GNU?' to 'is this compiler GNU or
LCC?'. The only places where this check is untouched, is where it
regards other platforms where LCC is unavailable (primarily non-Linux),
and where it REALLY differs from GNU compiler.
Note: this transition may break software that are already ported to
Elbrus, but hardly relies that LCC will be detected as GNU; still such
software is not known.
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2020-12-26 (227a4b97)
|
| |
|
| |
|
|
|
|
|
| |
The test for lzma_stream_encoder_mt was always failing
because the lzma libraries weren't being used by linker.
|
| |
|
| |
|
|
|
|
| |
The libarchive library code we use within CMake does not need these.
|
|
|
|
|
| |
Hard-code more libarchive options as internal cache entries. Doing so
makes some of our `IF(0)` conditions unnecessary, so remove those.
|
|
|
|
|
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2020-02-11 (3288ebb0)
Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks. Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
|
| |
|
|
|
|
|
|
|
| |
Build zstd as part of CMake or find one on the system. Modify our
port of libarchive to use the zstd configured for use with CMake.
Issue: #18657
|
| |
|
|
|
|
|
|
| |
In commit beb991110d (Remove now-unused code once used on IRIX,
2019-01-11, v3.14.0-rc1~167^2) we removed remnants of IRIX support.
Also remove remnants of MIPSpro compiler support.
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2018-09-03 (5fe69dd0)
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-07-09 (98a69539)
|
|
|
|
|
|
| |
This was added upstream but does not make sense in CMake because we
may replace the library with a logical target name that will not
work inside a `try_compile`.
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-02-25 (d6b1bb9f)
|
|
|
|
|
| |
* upstream-LibArchive:
LibArchive 2017-02-19 (100ee75a)
|
|
|
|
|
|
|
|
|
|
| |
In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto
library, 2016-05-03) we accidentally dropped the include directory for
OpenSSL as well as the library. Without that, it works only
accidentally when CHECK_CRYPTO happens to choose the OpenSSL
implementation and add the include directory.
Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
|
|
|
|
|
|
|
|
| |
We already add the crypto library after the ssl library when using
OpenSSL. Do not add it to the list of libraries individually or we may
end up with the wrong order later. Further investigation will be needed
to see how this change can be reconciled with the upstream need for the
original line.
|
|
|
|
|
| |
Resolve conflicts in C code by taking their side. Resolve conflicts in
CMake code by integrating the changes.
|
|
|
|
|
| |
The Debian package checker tool (lintian) detected several typos in
CMake.
|
|
|
|
| |
CMake does not use threads so we do not need this in our libarchive.
|
|
|
|
| |
Resolve conflicts by integrating changes from both sides.
|
|\
| |
| |
| |
| | |
29c3edb8 Avoid if() quoted auto-dereference
|
| |
| |
| |
| |
| |
| |
| | |
When testing CMAKE_<LANG>_COMPILER_ID values, do not explicitly
dereference or quote the variable. We want if() to auto-dereference the
variable and not its value. Also replace MATCHES with STREQUAL where
equivalent.
|
|/
|
|
|
| |
CMake 3.0 is the last release to require to be able to build with
Borland.
|
| |
|
|
|
|
|
| |
Build liblzma as part of CMake or find one on the system. Modify our
port of libarchive to use the liblzma configured for use with CMake.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
67f5f0a9 libarchive: Use _snprintf on Windows, not snprintf
fcfbb0a9 libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it
61a649d9 libarchive: Update README-CMake.txt for new snapshot
4533560c Merge branch 'libarchive-upstream' into update-libarchive
44d6b82f libarchive: Disable all whitespace checks in third-party code
37f225b7 libarchive 3.1.2-246-ga5a5d28b (reduced)
6ab7c326 libarchive: Avoid left-shift overflow of signed integer
|
| | |
|
| |
| |
| |
| |
| | |
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
|
|/ |
|
|
|
|
|
|
| |
Drop ENABLE_TAR and ENABLE_CPIO related options because we do not build
these command-line tools. Drop ENABLE_TEST and ENABLE_COVERAGE options
because we do not build the tests.
|
|
|
|
|
| |
CMake does not install the headers or libraries so skip the .pc file
too.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Apple distributes their own Clang build with their own version numbers
that differ from upstream Clang. Use the __apple_build_version__ symbol
to identify the Apple Clang compiler and report the Apple Build Version
as the fourth version component in CMAKE_<LANG>_COMPILER_VERSION. Add
Compiler/AppleClang-<lang> and Platform/Darwin-AppleClang-<lang> modules
that simply include the upstream equivalents.
Fix comparisons of CMAKE_<LANG>_COMPILER_ID to Clang in CMake's own
source and tests to account for AppleClang.
|