Skip to content

Commit 2da9977

Browse files
committed
Bug#34983380 Update LZ4 sources to 1.9.4
Change-Id: I14b6df5a99b6983b8da7769714854a0f4584f9e7
1 parent 1b62cdf commit 2da9977

File tree

14 files changed

+3421
-1724
lines changed

14 files changed

+3421
-1724
lines changed

cdk/extra/lz4/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ include(platform)
3535
enable_pic()
3636

3737
add_library(lz4 STATIC
38-
lz4.c
39-
lz4frame.c
40-
lz4hc.c
41-
xxhash.c
38+
lib/lz4.c
39+
lib/lz4frame.c
40+
lib/lz4hc.c
41+
lib/xxhash.c
4242
)
4343

44-
target_include_directories(lz4 PUBLIC ${PROJECT_SOURCE_DIR})
44+
target_include_directories(lz4 PUBLIC ${PROJECT_SOURCE_DIR}/lib)
4545
export(TARGETS lz4 NAMESPACE ext_ FILE ${PROJECT_BINARY_DIR}/exports.cmake)
4646

cdk/extra/lz4/LICENSE

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
LZ4 Library
2-
Copyright (c) 2011-2016, Yann Collet
3-
All rights reserved.
4-
5-
Redistribution and use in source and binary forms, with or without modification,
6-
are permitted provided that the following conditions are met:
7-
8-
* Redistributions of source code must retain the above copyright notice, this
9-
list of conditions and the following disclaimer.
10-
11-
* Redistributions in binary form must reproduce the above copyright notice, this
12-
list of conditions and the following disclaimer in the documentation and/or
13-
other materials provided with the distribution.
14-
15-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
16-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
19-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
22-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
This repository uses 2 different licenses :
2+
- all files in the `lib` directory use a BSD 2-Clause license
3+
- all other files use a GPLv2 license, unless explicitly stated otherwise
4+
5+
Relevant license is reminded at the top of each source file,
6+
and with presence of COPYING or LICENSE file in associated directories.
7+
8+
This model is selected to emphasize that
9+
files in the `lib` directory are designed to be included into 3rd party applications,
10+
while all other files, in `programs`, `tests` or `examples`,
11+
are intended to be used "as is", as part of their intended scenarios,
12+
with no intention to support 3rd party integration use cases.

0 commit comments

Comments
 (0)