StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

c-blosc: drop cmake patches and bump the c-blosc version

Browse Source 
The PR (https://github.com/Blosc/c-blosc/pull/329) was merged into
c-blosc, so we can use newer version of it.
This commit is contained in:
Mariusz Zaborski 2022-03-03 16:50:03 -05:00
parent 1cf2d840dd
commit 48ca0916a8
3 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/c-blosc/CMakeLists.txt
View File

@ -33,8 +33,7 @@ FetchContent_Declare(
libblosc
GIT_REPOSITORY https://github.com/Blosc/c-blosc.git
GIT_TAG a0e5c18d37db8e6f1003254a574c8062c5b45e00
PATCH_COMMAND patch < "${CMAKE_SOURCE_DIR}/patches/c-blosc.cmake.patch" && cd blosc && patch < "${CMAKE_SOURCE_DIR}/patches/c-blosc.blosc.cmake.patch"
GIT_TAG 5b68ad8a6c25e7f013e78b44e8b3bf3b5a6b9cc7
)
FetchContent_MakeAvailable(libblosc)

19
contrib/c-blosc/patches/c-blosc.blosc.cmake.patch
View File

@ -1,19 +0,0 @@
# This is patch has a pending PR: https://github.com/Blosc/c-blosc/pull/329
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -3,10 +3,9 @@ add_definitions(-DUSING_CMAKE)
set(INTERNAL_LIBS ${PROJECT_SOURCE_DIR}/internal-complibs)
-# Hide symbols by default unless they're specifically exported.
-# This makes it easier to keep the set of exported symbols the
-# same across all compilers/platforms.
-set(CMAKE_C_VISIBILITY_PRESET hidden)
+if(HIDE_SYMBOLS)
+ set(CMAKE_C_VISIBILITY_PRESET hidden)
+endif(HIDE_SYMBOLS)
# includes
set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})

25
contrib/c-blosc/patches/c-blosc.cmake.patch
View File

@ -1,25 +0,0 @@
# This is patch has a pending PR: https://github.com/Blosc/c-blosc/pull/329
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -13,6 +13,8 @@
# build fuzz test programs and generates the "test" target
# BUILD_BENCHMARKS: default ON
# build the benchmark program
+# HIDE_SYMBOLS: default ON
+# hide the symols that aren't specifically exported
# DEACTIVATE_SSE2: default OFF
# do not attempt to build with SSE2 instructions
# DEACTIVATE_AVX2: default OFF
@@ -98,6 +100,11 @@ option(BUILD_TESTS
"Build test programs from the blosc compression library" ON)
option(BUILD_FUZZERS
"Build fuzzer programs from the blosc compression library" ${BUILD_STATIC})
+# Hide symbols by default unless they're specifically exported.
+# This makes it easier to keep the set of exported symbols the
+# same across all compilers/platforms.
+option(HIDE_SYMBOLS
+ "Build a libraries with hidden symbols unless they're specifically exported" ON)
option(BUILD_BENCHMARKS
"Build benchmark programs from the blosc compression library" ON)
option(DEACTIVATE_SSE2