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

[CI] Update to Ubuntu 18.04 Docker images #1375

Merged
merged 3 commits into from May 29, 2021

Conversation

Frenzie
Copy link
Member

@Frenzie Frenzie commented May 24, 2021

See koreader/virdevenv#57 and koreader/virdevenv#62


This change is Reviewable

@Frenzie
Copy link
Member Author

Frenzie commented May 24, 2021

@pazos Actually, do you know which CMake F-Droid uses? I just realized the second commit may be a bit overenthusiastic.

@pazos
Copy link
Member

pazos commented May 25, 2021

@Frenzie
Copy link
Member Author

Frenzie commented May 25, 2021

Thanks. Well, I'll just revert that second commit. I don't think CMake <3.11 really gives us much extra anyway, although I do vaguely seem to recall @NiLuJe complaining about CMake <3.7 recently?

@NiLuJe
Copy link
Member

NiLuJe commented May 25, 2021

Whatever passes as "modern" CMake would be great^Wless terrible ;).

@Frenzie
Copy link
Member Author

Frenzie commented May 25, 2021

CMake 3+ and especially 3.4+ is called "modern" CMake afaik. :-P

@NiLuJe
Copy link
Member

NiLuJe commented May 25, 2021

As a point of reference, I can't even install anything older than 3.13 over here ;p.

@Frenzie
Copy link
Member Author

Frenzie commented May 25, 2021

@NiLuJe Sidenote, are you familiar with this argument fs by any chance? That's for the Sony build.

  CXXLD    libdjvulibre.la
libtool:   error: cannot find the library '' or unhandled argument 'fs'
Makefile:527: recipe for target 'libdjvulibre.la' failed
make[3]: *** [libdjvulibre.la] Error 1
make[3]: Leaving directory '/home/ko/base/thirdparty/djvulibre/build/arm-linux-gnueabihf/djvulibre-prefix/src/djvulibre/libdjvu'
Makefile:429: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory '/home/ko/base/thirdparty/djvulibre/build/arm-linux-gnueabihf/djvulibre-prefix/src/djvulibre'
Makefile:361: recipe for target 'all' failed
make[1]: *** [all] Error 2
make[1]: Leaving directory '/home/ko/base/thirdparty/djvulibre/build/arm-linux-gnueabihf/djvulibre-prefix/src/djvulibre'
ninja: build stopped: subcommand failed.
Makefile.third:163: recipe for target 'build/arm-linux-gnueabihf/libs/libdjvulibre.so.21' failed
make: *** [build/arm-linux-gnueabihf/libs/libdjvulibre.so.21] Error 1

Exited with code exit status 2

@NiLuJe
Copy link
Member

NiLuJe commented May 25, 2021

@Frenzie: That doesn't ring a bell, no. Hard to say what's happening without a verbose build to see the crazy libtool command line ;).

@Frenzie
Copy link
Member Author

Frenzie commented May 29, 2021

The Android image issue should be resolved in koreader/virdevenv#65.

I hadn't realized it was pulling in openjdk-11 (and was therefore defaulting to it).

tl;dr Should be almost done.

@Frenzie Frenzie merged commit 2d90d50 into koreader:master May 29, 2021
@Frenzie Frenzie deleted the update-update-update-ubuntu-18.04 branch May 29, 2021 20:22
Frenzie added a commit to Frenzie/koreader that referenced this pull request May 29, 2021
@jimman2003
Copy link
Contributor

jimman2003 commented May 29, 2021

Well missed the chance to request cmake 3.11..next time..

@Frenzie
Copy link
Member Author

Frenzie commented May 29, 2021

Just state your reasons.

@jimman2003
Copy link
Contributor

jimman2003 commented May 29, 2021

Well FetchContent and optimisations :)

@Frenzie
Copy link
Member Author

Frenzie commented May 29, 2021

Could you please be a lot more concrete?

@jimman2003
Copy link
Contributor

jimman2003 commented May 29, 2021

Cmake 3.13 has Quality of life changes...https://cmake.org/cmake/help/latest/release/3.13.html#id8 Maybe better…
Yeah… new dev easilly excitable..

@Frenzie
Copy link
Member Author

Frenzie commented May 29, 2021

But what do you want to do with FetchContent? How is DownloadProject insufficient? Which specific optimizations would be made possible?

@jimman2003
Copy link
Contributor

jimman2003 commented May 29, 2021

It ensures no duplicating of dependencies thoughout the project tree..

@Frenzie
Copy link
Member Author

Frenzie commented May 29, 2021

Which duplication are you referring to?

@jimman2003
Copy link
Contributor

jimman2003 commented May 29, 2021

Of source files ,no double downloads

@Frenzie
Copy link
Member Author

Frenzie commented May 29, 2021

Which double downloads are you referring to?

@jimman2003
Copy link
Contributor

No specific examples... I guess our big tree can can be help by caching deps that may be used in many subprojects

Frenzie added a commit to Frenzie/koreader that referenced this pull request Jun 1, 2021
Frenzie added a commit to Frenzie/koreader that referenced this pull request Jul 3, 2021
Frenzie added a commit to Frenzie/koreader that referenced this pull request Aug 22, 2021
roygbyte pushed a commit to roygbyte/koreader-base that referenced this pull request Mar 3, 2022
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

4 participants