Unzip was not building with bzip2 support #18
Merged
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
This appears to have begun at the point that we stopped shipping the static libbz2.a. Fixes: omniosorg/omnios-build#3448
rmustacc
reviewed
Jan 26, 2024
build/unzip/build.sh
Outdated
| @@ -48,6 +50,7 @@ configure_aarch64() { | |||
| } | |||
|
|
|||
| pre_install() { | |||
| ldd $PROG | $EGREP -s libbz2 || logerr "unzip was built without bzip2" | |||
There was a problem hiding this comment.
I wonder if we should be using eldfump -d here as otherwise you could get a false positive if a dep of a dep had libbz2 support.
There was a problem hiding this comment.
Good point, and the test also doesn't work for cross compiled binaries such as aarch64. Here's an update.
rmustacc
reviewed
Jan 27, 2024
build/unzip/build.sh
Outdated
| @@ -50,7 +50,8 @@ configure_aarch64() { | |||
| } | |||
|
|
|||
| pre_install() { | |||
| ldd $PROG | $EGREP -s libbz2 || logerr "unzip was built without bzip2" | |||
| $ELFEDIT -e dyn:dump -o simple $PROG | $EGREP -s 'libbz2\.so' \ | |||
There was a problem hiding this comment.
Suggested change
| $ELFEDIT -e dyn:dump -o simple $PROG | $EGREP -s 'libbz2\.so' \ | |
| $ELFEDIT -r -e 'dyn:tag NEEDED' -o simple $PROG | $EGREP -s 'libbz2\.so' \ |
This makes sure that elfedit opens it read-only, which should be fine, but if the users are off will throw this off. Tihs also only dumps the needed tag, so that way if something else is in here and matches for some weird reason, you'll not be thrown off. Here's an example output:
rm@beren:~$ elfedit -r -e 'dyn:tag NEEDED' /usr/bin/ls
index tag value
[1] NEEDED 0x693 libsec.so.1
[3] NEEDED 0x6b8 libnvpair.so.1
[5] NEEDED 0x6d0 libcmdutils.so.1
[7] NEEDED 0x6e1 libcurses.so.1
[8] NEEDED 0x6f0 libc.so.1
There was a problem hiding this comment.
Thanks, that's better, done.
rmustacc
approved these changes
Jan 27, 2024
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.
This imports several
unzipfixes from upstream - omniosorg/omnios-build#3449