fix(buildlibs.sh): Small changes to the buildlibs.sh script to provide macOS compatibility #110
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
…s for macOS compatability
…ndefined value error
MyNameIsMeerkat
commented
Sep 5, 2023
files/bin/buildlibs.sh
Outdated
| @@ -21,8 +21,7 @@ else | |||
| fi | |||
|
|
|||
| DEPS_DIR=${DEPS_DIR:-${HOME}/.local/c0} | |||
|
|
|||
| PKG_LIBS=${1}/lib/${OS}-${NIMARCH} | |||
| PKG_LIBS=${1:-"./files/deps"}/lib/${OS}-${NIMARCH} | |||
There was a problem hiding this comment.
I'm not a huge fan of the default string I have provided here but not sure what would be better. V open to suggestions
There was a problem hiding this comment.
I'd rather blow up if the variable isn't provided, if we actually need to do something here. Generally, nobody should need to run this manually.
viega
approved these changes
Sep 7, 2023
files/bin/buildlibs.sh
Outdated
| @@ -21,8 +21,7 @@ else | |||
| fi | |||
|
|
|||
| DEPS_DIR=${DEPS_DIR:-${HOME}/.local/c0} | |||
|
|
|||
| PKG_LIBS=${1}/lib/${OS}-${NIMARCH} | |||
| PKG_LIBS=${1:-"./files/deps"}/lib/${OS}-${NIMARCH} | |||
There was a problem hiding this comment.
I'd rather blow up if the variable isn't provided, if we actually need to do something here. Generally, nobody should need to run this manually.
files/bin/buildlibs.sh
Outdated
| @@ -223,7 +226,8 @@ function ensure_gumbo { | |||
| if ! copy_from_package libgumbo.a ; then | |||
| ensure_musl | |||
| get_src sigil-gumbo https://github.com/Sigil-Ebook/sigil-gumbo/ | |||
| sed -i '/examples/d' CMake* | |||
| sed -i.bakconf4mbak '/examples/d' CMake* | |||
There was a problem hiding this comment.
Assume this is some leftover stuff?
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.
macOS uses BSD
sedwhich errors out with the attempted usage of-ifor 'inplace'.The provided alternative is pretty gross but is cross-platform in terms of BSD & GNU. Replaced whole sed approach with just dumping asedCMakelists.txtfile of predefined structure.The provision of a default argument to the
${1}variable was needed to avoid an unset parameter error on macOS, I expect the root cause here to be whatever the version of bash macOS is using and whatever vintage it is vs current bash mainline.Older versions of macOS/OSX ship with a version of
unamethat doesn't not support the-oswitch for collecting OS version, it instead uses-s. Fix triesuname -ofirst and if that fails falls back touname -s.