d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libprivatezstd: Restrict symbol visibility similar to upstream

Browse Source 
We have to relax three symbols to dynamically link zstd(1), but the rest
are the same.
This commit is contained in:
Conrad Meyer 2021-01-03 11:26:01 -08:00
parent 4f9139397e
commit 98689d0ffb
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzstd/Makefile
View File

@ -36,7 +36,7 @@ SRCS= entropy_common.c \
WARNS?= 2 WARNS?= 2
INCS= zstd.h INCS= zstd.h
CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \ CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \
-DZSTD_MULTITHREAD=1 -DZSTD_MULTITHREAD=1 -fvisibility=hidden
LIBADD= pthread LIBADD= pthread
PRIVATELIB= yes PRIVATELIB= yes

3
sys/contrib/zstd/lib/common/xxhash.h
View File

@ -141,6 +141,9 @@ typedef unsigned int XXH32_hash_t;
typedef unsigned long long XXH64_hash_t; typedef unsigned long long XXH64_hash_t;
XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned int seed); XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned int seed);
/* Begin FreeBSD - This symbol is needed by dll-linked CLI zstd(1). */
__attribute__((visibility ("default")))
/* End FreeBSD */
XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed); XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned long long seed);
/*! /*!

3
sys/contrib/zstd/lib/dictBuilder/zdict.c
View File

@ -968,6 +968,9 @@ static size_t ZDICT_addEntropyTablesFromBuffer_advanced(
} }
/* Hidden declaration for dbio.c */ /* Hidden declaration for dbio.c */
/* Begin FreeBSD - This symbol is needed by dll-linked CLI zstd(1). */
ZSTDLIB_API
/* End FreeBSD */
size_t ZDICT_trainFromBuffer_unsafe_legacy( size_t ZDICT_trainFromBuffer_unsafe_legacy(
void* dictBuffer, size_t maxDictSize, void* dictBuffer, size_t maxDictSize,
const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples, const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,