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

Update to cURL 7.78.0 #1390

Merged
merged 2 commits into from Jul 23, 2021
Merged

Update to cURL 7.78.0 #1390

merged 2 commits into from Jul 23, 2021

Conversation

NiLuJe
Copy link
Member

@NiLuJe NiLuJe commented Jul 22, 2021 •
edited by Frenzie

@Frenzie
Copy link
Member

Frenzie commented Jul 23, 2021 

* Applying /home/ko/base/thirdparty/curl/curl-7.68.0-pb-rename.patch . . .
patching file lib/Makefile.am
Hunk #1 succeeded at 32 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 84 (offset 1 line).
Hunk #3 succeeded at 129 (offset 1 line).
patching file src/Makefile.am
Hunk #1 FAILED at 61.
1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.am.rej
[4/8] cd /home/ko/base/thirdparty/curl/build/arm-pocketbook-linux-gnueabi && /usr/bin/cmake -E echo_append && /usr/bin/cmake -E touch /home/ko/base/thirdparty/curl/build/arm-pocketbook-linux-gnueabi/curl-prefix/src/curl-stamp/curl-update
ninja: build stopped: subcommand failed.
Makefile.third:803: recipe for target 'build/arm-pocketbook-linux-gnueabi/libs/libcurl_ko.so.4' failed
make: *** [build/arm-pocketbook-linux-gnueabi/libs/libcurl_ko.so.4] Error 1

Exited with code exit status 2

@NiLuJe NiLuJe merged commit d4ba06b into koreader:master Jul 23, 2021
NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Jul 24, 2021
@NiLuJe
Bump base
f021570 
koreader/koreader-base#1390
koreader/koreader-base#1392
@NiLuJe NiLuJe mentioned this pull request Jul 24, 2021
Merged
NiLuJe added a commit to koreader/koreader that referenced this pull request Jul 24, 2021
@NiLuJe
Bump base (#8019)
af4a883 
koreader/koreader-base#1390
koreader/koreader-base#1392
roygbyte pushed a commit to roygbyte/koreader-base that referenced this pull request Mar 3, 2022
@NiLuJe @roygbyte
Update to cURL 7.78.0 (koreader#1390)
c5c1301 
* Update to cURL 7.78.0

* Refresh PB patch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Frenzie Frenzie Frenzie approved these changes

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
2 participants
@NiLuJe @Frenzie