Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkg-config: add Requires.private field to allow static builds #354

Merged
merged 2 commits into from
Nov 2, 2020

Conversation

lovell
Copy link
Contributor

@lovell lovell commented Oct 3, 2020

This ensures the linker is made aware of symbols from transitive dependencies.

@lovell
Copy link
Contributor Author

lovell commented Oct 3, 2020

It looks like the libde265 (2) CI tasks install libde265 to a non-standard location but don't update PKG_CONFIG_PATH accordingly, hence the failure of the go / libde265 (2) task.

I think the following CI change might get it passing, but unsure if this is the best approach.

diff --git a/scripts/prepare-ci.sh b/scripts/prepare-ci.sh
index c1a729d..3f9ba15 100755
--- a/scripts/prepare-ci.sh
+++ b/scripts/prepare-ci.sh
@@ -63,6 +63,7 @@ if [ -z "$CHECK_LICENSES" ] && [ -z "$CPPLINT" ] && [ -z "$CMAKE" ]; then
     fi
     if [ ! -z "$GO" ]; then
         CONFIGURE_ARGS="$CONFIGURE_ARGS --prefix=$BUILD_ROOT/dist --disable-gdk-pixbuf"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BUILD_ROOT/dist"
     else
         CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-go"
     fi

UPDATE: It looks like PKG_CONFIG_PATH is configured in a few places and I've now modified enough of them to keep the CI tests happy. Perhaps consolidation of these could be a useful improvement, but that's probably for a separate PR.

@lovell lovell force-pushed the pkg-config-requires-private branch 3 times, most recently from 51bd94c to 6987eff Compare October 5, 2020 14:17
@lovell
Copy link
Contributor Author

lovell commented Oct 5, 2020

(Apologies for the CI noise, I'll hopefully work out the relevant PKG_CONFIG_PATH to modify soon.)

@lovell lovell force-pushed the pkg-config-requires-private branch 3 times, most recently from 9e6ff00 to f342cbb Compare October 5, 2020 14:50
Ensure cmake is aware of gdk-pixbuf pthread dependency
for static builds.
@farindk
Copy link
Contributor

farindk commented Nov 2, 2020

Thank you. I resolved the merge conflicts. Please check that your changes are still working. I'll then merge it into master.

@lovell
Copy link
Contributor Author

lovell commented Nov 2, 2020

@farindk LGTM, thank you.

@farindk farindk merged commit 2f1838f into strukturag:master Nov 2, 2020
@farindk
Copy link
Contributor

farindk commented Nov 2, 2020

Good. Has been merged.

@lovell lovell deleted the pkg-config-requires-private branch November 3, 2020 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants