-
Notifications
You must be signed in to change notification settings - Fork 105
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
Allow toggling CRe's new dithering & scaling #888
Conversation
Oh, joy, even GCC 5.4 defaults to gnu++98 -_-" |
# Anything below GCC 6 gets to be forcefully switched to decent standards... | ||
# NOTE: We're also assuming Clang >= 3.2, but that should more or less hold true on our end. | ||
# Anything below GCC 6 gets to be forcefully switched to decent standards, because some of our deps require C11 & C++11 support. | ||
# NOTE: Technically, this also means we require Clang >= 3.2, but that should more or less hold true on our end, because that's truly ancient. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think older than Clang 5 realistically occurs for us in any scenario.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that's what I thought. Even the Travis mention a few lines before mentions 3.4, and that's already an old comment, for an old Travis image ;).
Let's see PB's GCC choke on C11/C++11...
Here's hoping that'll do the trick even on PB...
(IIRC, GCC 6.0 never came out, so, eh).
It's calling CXX w/ CFLAGS, which is braindead on all kinds of levels.
Anbdroid TCs are stuck on GCC 4.9 (Pre-GPL3).
test/rsa_complex.c:17:23: fatal error: complex.h: No such file or directory
thirdparty/openssl/CMakeLists.txt
Outdated
@@ -62,7 +62,7 @@ set(PATCH_CMD1 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.0j- | |||
set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.1b-CVE-2019-1543.patch || true") | |||
set(PATCH_CMD3 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-origin-rpath.patch || true") | |||
# GCC 4.9's <stdatomic.h> is broken (c.f., https://github.com/pytorch/pytorch/issues/3050) | |||
if($ENV{SONY_PRSTUX}) | |||
if($ENV{SONY_PRSTUX} OR $ENV{ANDROID}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PS With your switch to OpenSSL 1.1.1 you probably just took the main (minor) obstacle to Android Clang out of the way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
\o/
[skip-ci]
Crap, I added a dash to skip-ci. It's [skip ci]. -_-". IT WAS GREEN. I SWEAR! :D |
set(PATCH_CMD2 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.1b-CVE-2019-1543.patch || true") | ||
set(PATCH_CMD3 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/openssl-origin-rpath.patch || true") | ||
# GCC 4.9's <stdatomic.h> is broken (c.f., https://github.com/pytorch/pytorch/issues/3050) | ||
if(DEFINED ENV{SONY_PRSTUX} OR DEFINED ENV{ANDROID}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So something like ANDROID and "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's assuming the configure script manages to pick up Clang properly (c.f. the Android branch on top with a CC=gcc to avoid it spazzing out because of ccache and our hacked CC with appended -static-libstdc++) ;o).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But, yeah, that patch would probably not behave on Clang as it's using GCC internal builtins ^^.
@NiLuJe There's a new error message since this commit. Not sure if it's harmless?
|
At which point of the build?
…On Sat, Apr 20, 2019, 09:49 Frans de Jonge ***@***.***> wrote:
@NiLuJe <https://github.com/NiLuJe> There's a new error message since
this commit. Not sure if it's harmless?
ccache: error: Could not find compiler "arm-linux-androideabi-gcc" in PATH
ccache: error: Could not find compiler "arm-linux-androideabi-gcc" in PATH
ccache: error: Could not find compiler "arm-linux-androideabi-gcc" in PATH
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#888 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAA3KZRXPZIGYCJD4PWT763PRLDJTANCNFSM4HF3DTSQ>
.
|
At every point? |
It's clang up until the point where |
Oh, you meant the ccache "could not find in path" error message. Pardon. Um, that's somewhere near the beginning. |
Anyway, the clang build is now broken because that
|
Never mind(ish), it seems to be using GCC there for some reason. >_< So the Clang build is still broken, just not due to Clang per se. |
A bit of an emergency fix to just get it working ASAP. A patch was added to base LuaJIT in koreader/koreader-base#892, which caused a mismatch and build failures over here. Unfortunately that was hidden by some excessive Android verbosity inadvertently introduced in koreader/koreader-base#888, and on my local instance where I did a sanity check LuaJIT was already compiled…
A bit of an emergency fix to just get it working ASAP. A patch was added to base LuaJIT in koreader/koreader-base#892, which caused a mismatch and build failures over here. Unfortunately that was hidden by some excessive Android verbosity inadvertently introduced in koreader/koreader-base#888, and on my local instance where I did a sanity check LuaJIT was already compiled…
* [fix] Add LuaJIT patch to sync with koreader-base koreader/android-luajit-launcher#141 A bit of an emergency fix to just get it working ASAP. A patch was added to base LuaJIT in koreader/koreader-base#892, which caused a mismatch and build failures over here. Unfortunately that was hidden by some excessive Android verbosity inadvertently introduced in koreader/koreader-base#888, and on my local instance where I did a sanity check LuaJIT was already compiled…
* [fix] Add LuaJIT patch to sync with koreader-base koreader/android-luajit-launcher#141 A bit of an emergency fix to just get it working ASAP. A patch was added to base LuaJIT in koreader/koreader-base#892, which caused a mismatch and build failures over here. Unfortunately that was hidden by some excessive Android verbosity inadvertently introduced in koreader/koreader-base#888, and on my local instance where I did a sanity check LuaJIT was already compiled…
* [fix] Add LuaJIT patch to sync with koreader-base koreader/android-luajit-launcher#141 A bit of an emergency fix to just get it working ASAP. A patch was added to base LuaJIT in koreader/koreader-base#892, which caused a mismatch and build failures over here. Unfortunately that was hidden by some excessive Android verbosity inadvertently introduced in koreader/koreader-base#888, and on my local instance where I did a sanity check LuaJIT was already compiled…
Plus, implement said dithering in our own BB code, for ImageWidget
Requires koreader/crengine#282