A few minor buildsystem tweaks #817
Conversation
NiLuJe
commented
Feb 16, 2019
NiLuJe
commented
- Avoid compat CFLAGS on kobo & kindle-legacy when using our TCs
- Disable ARM ASM in MµPDF, and honor debug builds
I somehow managed to miss kobo & kindle-legacy targets the last time we went over this...
It's potentially crashy, and impossible to debug. c.f., https://bugs.ghostscript.com/show_bug.cgi?id=698879 koreader#816 Also, honor debug builds in MuPDF (as it enforces CFLAGS).
|
AFAICT, it's really ARM asm, not NEON. |
| @@ -71,6 +71,8 @@ set(PATCH_CMD3 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg_shared. | |||
| # NOTE: There's also a few ARCH_UNALIGNED_OK checks, but we never did pass that define. | |||
| # (FWIW, we *could*, on anything not kindle-legacy). | |||
| set(PATCH_CMD4 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/no_arm_asm.patch || true") | |||
| # Honor CFLAGS | |||
| set(PATCH_CMD5 sh -c "patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/honor_cflags.patch || true") | |||
There was a problem hiding this comment.
Getting pretty complex there, lol.
thirdparty/mupdf/CMakeLists.txt
Outdated
| else() | ||
| set(MUPDF_BUILD_TYPE "release") | ||
| endif() | ||
| set(BUILD_CMD_GENERATE sh -c "env CFLAGS=\"${HOSTCFLAGS}\" $(MAKE) -j${PARALLEL_JOBS} generate build=\"${MUPDF_BUILD_TYPE}\" CC=\"${HOSTCC}\" verbose=\"yes\"") |
There was a problem hiding this comment.
Is 1 and yes equivalent here or was the 1 not doing anything?
There was a problem hiding this comment.
The Makefile is explicitly doing ifneq "$(verbose)" "yes", so, yeah, if the intent was to get verbose builds, that wasn't doing the trick ;).
Whether we actually want a verbose build here is debatable, though ;).
You know my position on the subject, but I'm perfectly okay with switching that back to "no" here ;).
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
There was a problem hiding this comment.
Verbose all the way as far as I'm concerned. It's just that too much of it can cause trouble with one of the CI services (definitely Travis and GitLab, possibly CircleCI as well).
There was a problem hiding this comment.
I think at least one of them (not Travis, certainly not GitLab) might do something more akin to a terminal emulator (i.e., just a limited amount of scrollback), which sounds potentially a lot more useful to catch the error.
Buildsystem appears to behave with the CFLAGS tweaks. Use "no" to make it clearer that, if we wanted verbose builds, we do have to explicitly use "yes" ;).
|
From what I've seen, it's literally nearly a decade old ARM inline asm (switching from thumb to ARM mode and everything!). I'm fairly confident GCC should nowadays be doing something fairly non-stupid with the pure C versions. |
|
(I'll bump base tomorrow, already too much new stuff in the next nightly ;)). |
Picks up: * PB fb setup cleanups koreader/koreader-base#813 * Buildsystem tweaks koreader/koreader-base#817
* Bump base * PB fb setup cleanups (koreader/koreader-base#813) * Buildsystem tweaks (koreader/koreader-base#817) * Disable HW dithering on Kindle koreader/koreader-base#819)
* Bump base * PB fb setup cleanups (koreader/koreader-base#813) * Buildsystem tweaks (koreader/koreader-base#817) * Disable HW dithering on Kindle koreader/koreader-base#819)
