fix building with a custom sysroot directory#3
Open
KanjiMonster wants to merge 3 commits into
Open
Conversation
When locally building, one might want to install to a different directory, or look for dependencies from a different path. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Do not assume ubox and ubus are system libraries, but actually look for them e.g. in install prefix as well. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Like with ubox and ubus libraries, search for uci.h and use the result. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fix building with a non-default sysroot directory:
CMAKE_INSTALL_PREFIXinstead of forcing it to/uci.hinstead of assuming it is present in the system include directoriesUsing these changes, I can just let
ucietc install into a local directory, and then tell ustp to look for libraries in that local directory by just setting the install prefix to that directory.Note that 1. will break the OpenWrt package build and requires updating the package recipe. OpenWrt passes
/usras install prefix, soustpwill now install itself correctly to/usr/sbininstead of/sbin, but the package recipe looks in/sbin. Easy fix, but still.