make: Add ZSTD_PROGRAMS_LINK_SHARED to dll-link zstd #2450
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add a make variable ZSTD_PROGRAMS_LINK_SHARED. When set, libzstd exports private symbols needed to shared-link the zstd program. zstd is linked against this libzstd.so.
cemeyer
commented
Jan 3, 2021
| @@ -1198,6 +1198,9 @@ size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSe | |||
|
|
|||
| /** ZSTD_cycleLog() : | |||
| * condition for correct operation : hashLog > 1 */ | |||
| #if defined(ZSTD_PROGRAMS_LINK_SHARED) | |||
There was a problem hiding this comment.
This could instead be some conditionally-defined ZSTDLIB_CLI_DLL_API (or whatever) in lib/zstd.h. I don't feel strongly about it; the number of instances needed will probably remain very small.
There was a problem hiding this comment.
We could probably remove ZSTD_cycleLog() dependency. It's a trivial code to copy.
uqs
pushed a commit
to freebsd/freebsd-src
that referenced
this pull request
Jan 3, 2021
Fix non-FreeBSD CI build after v1.4.8. This definition was only used in zstd(1), which isn't part of non-FreeBSD CI (I guess). The ifdef was added in v1.4.5 import. Upstream does not currently support shared-linked zstd(1), but I have proposed facebook/zstd#2450 . If that is adopted, we can add -DZSTD_PROGRAMS_LINK_SHARED to our libzstd build and drop some diffs. Reported by: uqs
Cyan4973
reviewed
Jan 5, 2021
| @@ -968,6 +968,9 @@ static size_t ZDICT_addEntropyTablesFromBuffer_advanced( | |||
| } | |||
|
|
|||
| /* Hidden declaration for dbio.c */ | |||
| #if defined(ZSTD_PROGRAMS_LINK_SHARED) | |||
| ZSTDLIB_API | |||
There was a problem hiding this comment.
Here, we could make ZDICT_trainFromBuffer_unsafe_legacy() function part of the "unstable"/"experimental" section of zdict API.
Another alternative is to not use it in dibio.c and use the safe variant instead.
It comes at an additional memory allocation cost, but might be worth it to remove this dependency.
Cyan4973
added a commit
that referenced
this pull request
Jan 6, 2021
ZSTD_cycleLog() is a very short function, creating a rather large dependency onto libzstd's internal just for it is overkill. Prefer duplicating this 2-lines function. This PR makes the zstd CLI one step closer to being linkable to the dynamic library (see #2450) More steps are still needed to reach this goal.
This was referenced Jan 6, 2021
|
In #2457, there is a proposed PR The proposed method ( |
|
Both proposals work well for me. |
|
Superseded by #257 |
brooksdavis
pushed a commit
to CTSRD-CHERI/cheribsd
that referenced
this pull request
Oct 15, 2021
Fix non-FreeBSD CI build after v1.4.8. This definition was only used in zstd(1), which isn't part of non-FreeBSD CI (I guess). The ifdef was added in v1.4.5 import. Upstream does not currently support shared-linked zstd(1), but I have proposed facebook/zstd#2450 . If that is adopted, we can add -DZSTD_PROGRAMS_LINK_SHARED to our libzstd build and drop some diffs. Reported by: uqs (cherry picked from commit bcae12b)
brooksdavis
pushed a commit
to CTSRD-CHERI/cheribsd
that referenced
this pull request
Oct 15, 2021
Fix non-FreeBSD CI build after v1.4.8. This definition was only used in zstd(1), which isn't part of non-FreeBSD CI (I guess). The ifdef was added in v1.4.5 import. Upstream does not currently support shared-linked zstd(1), but I have proposed facebook/zstd#2450 . If that is adopted, we can add -DZSTD_PROGRAMS_LINK_SHARED to our libzstd build and drop some diffs. Reported by: uqs (cherry picked from commit bcae12b)
brooksdavis
pushed a commit
to CTSRD-CHERI/cheribsd
that referenced
this pull request
Oct 19, 2021
Fix non-FreeBSD CI build after v1.4.8. This definition was only used in zstd(1), which isn't part of non-FreeBSD CI (I guess). The ifdef was added in v1.4.5 import. Upstream does not currently support shared-linked zstd(1), but I have proposed facebook/zstd#2450 . If that is adopted, we can add -DZSTD_PROGRAMS_LINK_SHARED to our libzstd build and drop some diffs. Reported by: uqs
brooksdavis
pushed a commit
to CTSRD-CHERI/cheribsd
that referenced
this pull request
Oct 20, 2021
Fix non-FreeBSD CI build after v1.4.8. This definition was only used in zstd(1), which isn't part of non-FreeBSD CI (I guess). The ifdef was added in v1.4.5 import. Upstream does not currently support shared-linked zstd(1), but I have proposed facebook/zstd#2450 . If that is adopted, we can add -DZSTD_PROGRAMS_LINK_SHARED to our libzstd build and drop some diffs. Reported by: uqs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a make variable ZSTD_PROGRAMS_LINK_SHARED. When set, libzstd
exports private symbols needed to shared-link the zstd program. zstd is
linked against this libzstd.so.
(See issues #2261, #1680.)