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

Fix ZSTD rpath #1260

Merged
merged 2 commits into from
Dec 19, 2020
Merged

Fix ZSTD rpath #1260

merged 2 commits into from
Dec 19, 2020

Conversation

NiLuJe
Copy link
Member

@NiLuJe NiLuJe commented Dec 19, 2020

We don't really need it, but it was broken by the switch to env from MOREFLAGS ;).

Also fix CRe's dependencies on macOS to avoid it depending on brew's zstd.


This change is Reviewable

Copy link
Member

@Frenzie Frenzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@NiLuJe NiLuJe merged commit 59a97a5 into koreader:master Dec 19, 2020
NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Dec 19, 2020
NiLuJe added a commit to koreader/koreader that referenced this pull request Dec 19, 2020
* Comment the brew shenanigans
  (And support non-standard brew prefixes, just in case)
* Bump base to pickup koreader/koreader-base#1260
* Handle libsodium, too
Co-authored-by: Martín Fernández <paziusss@gmail.com>
roygbyte pushed a commit to roygbyte/koreader-base that referenced this pull request Mar 3, 2022
* Fix ZSTD's rpath
  Not that we actually need it, but, still.
* Make sure CRe depends on *ours* zstd, not brew's.
   Re: koreader/koreader#6875
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.

None yet

2 participants