Fix: sdl2-config would always be detected as present #8145
Merged
+1
−1
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
The presence of sdl2-config is used go determine whether to look for sdl2 first, or just sdl1. However, when sdl2-config is *not* present, `which` returns an empty string. Due to lack of quoting, this produces `[ -x ]`, rather than `[ -x "" ]` and it turns out the former actually has a succesful exit status for some reason. This was not a problem when just running configure, because it would then just fail to detect sdl2 and fall back to sdl1. However, when passing `--with-sdl` (without specifying a version), this would only attempt to detect sdl2, even when sdl2-config was not present, but sdl1 is. Adding quotes makes the check work as intended.
LordAro
approved these changes
May 13, 2020
LordAro
added
the
backport requested
10 tasks
SFrijters
added a commit
to SFrijters/nixpkgs
that referenced
this pull request
Jun 4, 2020
A bug in the upstream configure script was fixed (OpenTTD/OpenTTD#8145), which means we now need `which` available during the build.
jonringer
pushed a commit
to NixOS/nixpkgs
that referenced
this pull request
Jun 4, 2020
A bug in the upstream configure script was fixed (OpenTTD/OpenTTD#8145), which means we now need `which` available during the build.
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Jun 5, 2020
A bug in the upstream configure script was fixed (OpenTTD/OpenTTD#8145), which means we now need `which` available during the build. (cherry picked from commit 87dc127)
LordAro
added
backported
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.
The presence of sdl2-config is used go determine whether to look for
sdl2 first, or just sdl1. However, when sdl2-config is not present,
whichreturns an empty string. Due to lack of quoting, this produces[ -x ], rather than[ -x "" ]and it turns out the former actuallyhas a succesful exit status for some reason.
This was not a problem when just running configure, because it would
then just fail to detect sdl2 and fall back to sdl1. However, when
passing
--with-sdl(without specifying a version), this would onlyattempt to detect sdl2, even when sdl2-config was not present, but sdl1
is.
Adding quotes makes the check work as intended.