MDEV-34825 FreeBSD fails to build under clang natively #3484
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
grooverdan
force-pushed
the
10.5-MDEV-34825-freebsd
branch
from
d3d429f
to
634a74d
Compare
|
test: https://buildbot.mariadb.org/#/builders/619/builds/6305
Removed on unneeded commit, but all should pass again. |
grooverdan
force-pushed
the
10.5-MDEV-34825-freebsd
branch
from
dd8ca6e
to
546060e
Compare
LinuxJedi
approved these changes
Sep 2, 2024
| INCLUDE (ExternalProject) | ||
|
|
||
| SET(WITH_PCRE "auto" CACHE STRING | ||
| "Which pcre to use (possible values are 'bundled', 'system', or 'auto')") | ||
|
|
||
| MACRO(BUNDLE_PCRE2) | ||
| SET(dir "${CMAKE_BINARY_DIR}/extra/pcre2") | ||
| SET(PCRE_INCLUDES ${dir}/src/pcre2-build ${dir}/src/pcre2/src) | ||
| SET(PCRE_INCLUDE_DIRS ${dir}/src/pcre2-build ${dir}/src/pcre2/src) |
There was a problem hiding this comment.
This renaming will break ColumnStore, best to flag this to that team.
There was a problem hiding this comment.
Turns out 10.6 (develop-6) was already out of date - mariadb-corporation/mariadb-columnstore-engine#3304
develop-5 doesn't appear to be getting updated.
Appended commit for it d80ce3d
clang doesn't have /usr/local/lib in the path. As such there are various depedency linkages that will fail. For example pcre and libfmt.`
Without the call to my_mutex_init, the mutex attributes my_fast_mutexattr and my_errorcheck_mutexattr are uninitialized. Linux tolerates this but FreeBSD doesn't (and segfaults). We fix for all since the unit text should be testing the standard mutexes of the system.
use pkg-config to find pcre2, if possible rename PCRE_INCLUDES to use PKG_CHECK_MODULES naming, PCRE_INCLUDE_DIRS
even if pkg-config has it. otherwise build dependencies aren't detected.
Taking both the FreeBSD[1] and Alpine[1] patch concepts; provide non-GLIBC definations for HMT_*. Provide FreeBSD ASM base for __ppc_get_timebase. On alternately use __builtin_ppc_get_timebase which is described on https://gcc.gnu.org/onlinedocs/gcc/Basic-PowerPC-Built-in-Functions-Available-on-all-Configurations.html an not depended on glibc/musl. [1] https://github.com/freebsd/freebsd-ports/blob/15d22e1c70da81aaa5751ad0d82f92e9451c4d81/databases/mariadb106-server/files/patch-include_my__cpu.h [2] https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/mariadb/ppc-remove-glibc-dep.patch
grooverdan
force-pushed
the
10.5-MDEV-34825-freebsd
branch
from
546060e
to
0f351b9
Compare
From e735cf2, the PCRE_INCLUDES changed to PCRE_INCLUDE_DIRS for consistency. The columnstore module depends on the old name. Create a mapping for the columnstore submodule. 10.6+ fix for submodule is: * mariadb-corporation/mariadb-columnstore-engine#3304
grooverdan
force-pushed
the
10.5-MDEV-34825-freebsd
branch
from
0f351b9
to
d80ce3d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
clang doesn't have /usr/local/lib in the path. As such there are various depedency linkages that will fail.
For example pcre and libfmt.`
Release Notes
Add /usr/local/lib to linking path for FreeBSD.
How can this PR be tested?
Check BB FreeBSD worker to ensure that pcre is linked rather than bundled.
Basing the PR against the correct MariaDB version
mainbranch.PR quality check
@Sp1l is this too much of a hack?