Fix htslib.map update #1975
Merged
Fix htslib.map update #1975
Conversation
This file contains hidden or 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
At some point `nm --with-symbol-versions` stopped appending `@@Base` to unversioned symbols. This broke the awk script that looked for symbols to add to the `htslib.map` file. Fix by changing the match criteria to accept symbol names with no version appended as well as `@@Base`, and make minor adjustments to how the semicolon is appended to the name in the output. Also add `--defined-only` to the `nm` command line to get rid of imported functions as they don't follow the same output format as for the symbols we want (the first column is blank). Removing them eliminates the chance that these lines could be incorrectly included.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
At some point
nm --with-symbol-versionsstopped appending@@Baseto unversioned symbols. This broke the awk script that looked for symbols to add to thehtslib.mapfile. Fix by changing the match criteria to accept symbol names with no version appended as well as@@Base, and make minor adjustments to how the semicolon is appended to the name in the output.Also add
--defined-onlyto thenmcommand line to get rid of imported functions as they don't follow the same output format as for the symbols we want (the first column is blank). Removing them eliminates the chance that these lines could be incorrectly included.Fixes #1971 although care will have to be taken on the next release to ensure that the missed symbols get attached to the correct version. Possibly this could be done by pushing a commit to add them manually prior to release building activities.