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.

Sign up for GitHub

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

Jump to bottom

RPATH shenanigans #1637

Merged
merged 3 commits into from
Jul 13, 2023
Merged

RPATH shenanigans #1637

merged 3 commits into from
Jul 13, 2023

Conversation

NiLuJe
Copy link
Member

@NiLuJe NiLuJe commented Jul 13, 2023 •
edited

While making sure we stick an $ORIGIN rpath in webp, I noticed that curl's made no sense, and that zstd's made no sense either (and doesn't matter anyway).

Currently running a few builds of my own to double-check the sanity of all that...

This change is Reviewable

@NiLuJe
Err, libcurl's rpath made no sense
ceccc81 
It lives in libs/ already...
@NiLuJe
And libzstd's rpath made no sense either
a1a099d 
It's a library, not a binary in the root folder.

Also, it doesn't actually have meaningful deps, so we don't actually
need an rpath anyway...
@NiLuJe
Set webp's rpath to $ORIGIN, so it picks up our own dependencies
12cf8b3
@NiLuJe
Copy link
Member Author

NiLuJe commented Jul 13, 2023

Seems to have taken:

  72   │ Dynamic section at offset 0x2ef0 contains 30 entries:
  73   │   Tag        Type                         Name/Value
  74   │  0x00000001 (NEEDED)                     Shared library: [libwebp.so.7]
  75   │  0x00000001 (NEEDED)                     Shared library: [libsharpyuv.so.0]
  76   │  0x00000001 (NEEDED)                     Shared library: [libm.so.6]
  77   │  0x00000001 (NEEDED)                     Shared library: [libpthread.so.0]
  78   │  0x00000001 (NEEDED)                     Shared library: [libc.so.6]
  79   │  0x0000000e (SONAME)                     Library soname: [libwebpdemux.so.2]
  80   │  0x0000000f (RPATH)                      Library rpath: [/var/tmp/niluje/koreader/base/thirdparty/libwebp/build/arm-kobo-linux-gnueabihf/libwebp-prefix/src/libwebp-build/lib:$ORIGIN]

@NiLuJe NiLuJe merged commit fcf5c57 into koreader:master Jul 13, 2023
2 checks passed
NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Jul 13, 2023
@NiLuJe
Bump base for webp rpath fixes
2505e7f 
koreader/koreader-base#1637
NiLuJe added a commit to koreader/koreader that referenced this pull request Jul 13, 2023
@NiLuJe
Bump base for webp rpath fixes
890dc81 
koreader/koreader-base#1637
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@NiLuJe