Conversation
|
Will remove libelf, libbpf, and bpftool before re-requesting review. |
| CT_NCURSES_EXTRA_CFLAGS="-std=gnu17" | ||
| CT_COMP_LIBS_ZLIB=y | ||
| CT_COMP_LIBS_ZLIB_PKG_KSYM="ZLIB" | ||
| CT_ZLIB_DIR_NAME="zlib" | ||
| CT_ZLIB_PKG_NAME="zlib" | ||
| CT_ZLIB_SRC_RELEASE=y | ||
| # CT_ZLIB_SRC_DEVEL is not set | ||
| CT_ZLIB_PATCH_ORDER="global" | ||
| CT_ZLIB_V_1_3_1=y | ||
| # CT_ZLIB_V_1_2_13 is not set | ||
| CT_ZLIB_VERSION="1.3.1" | ||
| CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/" | ||
| CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" | ||
| CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" | ||
| CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" | ||
| CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" |
There was a problem hiding this comment.
Do we need to enable zlib here?
Afaik we compile zlib separately already. Sorry I don't have more guidance right now, but I'm just wondering if we shouldn't just use one or the other, instead of risking having two different versions being used.
There was a problem hiding this comment.
@Smjert I dug into this and I think the answer is we should have zlib in both places. Crosstool-ng does seem to require zlib. Maybe in the older version it was implicitly relying on the system zlib?
It seems like we have 2 options for crosstool-ng
- Use system zlib
- Build zlib (what this configuration sets)
crosstool-ng does not seem to install or make available this zlib beyond linking it into the generated gcc. Because of that, we also want to build zlib which is required by the LLVM linker.
When I tried removing the explicit zlib build in the script, I found that I would get linker errors later in the build process when the linker could not find the zlib library (preventing the linker from executing).
zwass
force-pushed
the
upgrade-toolchain
branch
from
392d15d to
a6ca620
Compare
|
Will look at whether this change is necessary: Smjert@6d7b89d |
|
Builds from these toolchains and the changes in osquery/osquery#8743 tested working on X86 builds are currently not completing due to errors in the boost build. |
|
Tested on x86 Ubuntu 16, 18, 20, 22, 24, CentOS 7, 8, 9. Note CentOS 6 fails to start because it uses glibc 2.12. |
|
@Smjert this is ready for review |
build.sh
Outdated
| # Make so that ZLIB_ROOT is relative to the Config.cmake, | ||
| # since we want for it to report |
There was a problem hiding this comment.
Is this comment enough for future us?
3 participants
Uh oh!
There was an error while loading. Please reload this page.