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

mariadb: update to 10.5.9. #30143

Merged
merged 28 commits into from Apr 15, 2021
Merged

Conversation

Veganizer
Copy link
Contributor

@Veganizer Veganizer commented Apr 11, 2021

General

Have the results of the proposed changes been tested?

  • I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
  • I generally don't use the affected packages but briefly tested this PR

Does it build and run successfully?

(Please choose at least one native build and, if supported, at least one cross build. More are better.)

  • I built this PR locally for my native architecture, (x86_64 x86_64-musl)
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • aarch64-musl
    • armv7l
    • armv6l-musl

Cross compiling works now!

[ci skip]

@ericonr
Copy link
Member

ericonr commented Apr 11, 2021

Might make it easier to help to share the relevant parts of

2021-04-11T04:31:52.2089340Z See also "/builddir/mariadb-10.5.9/build/CMakeFiles/CMakeOutput.log".
2021-04-11T04:31:52.2090601Z See also "/builddir/mariadb-10.5.9/build/CMakeFiles/CMakeError.log".

@Veganizer
Copy link
Contributor Author

Veganizer commented Apr 11, 2021

Determining if the function floor exists failed with the following output:
Change Dir: /builddir/mariadb-10.5.9/build/CMakeFiles/CMakeTmp

Run Build Command(s):/usr/bin/ninja cmTC_d867c && [1/2] Building C object CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o
<command-line>: warning: conflicting types for built-in function 'floor'; expected 'double(double)' [-Wbuiltin-declaration-mismatch]
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS'
    7 |   CHECK_FUNCTION_EXISTS(void);
      |   ^~~~~~~~~~~~~~~~~~~~~
/usr/share/cmake-3.19/Modules/CheckFunctionExists.c:1:1: note: 'floor' is declared in header '<math.h>'
  +++ |+#include <math.h>
    1 | #ifdef CHECK_FUNCTION_EXISTS
[2/2] Linking C executable cmTC_d867c
FAILED: cmTC_d867c 
: && /builddir/.xbps-mariadb/wrappers/aarch64-linux-gnu-gcc -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv8-a   -I/usr/aarch64-linux-gnu/usr/include -pie -fPIC -fstack-protector --param=ssp-buffer-size=4 -moutline-atomics -DCHECK_FUNCTION_EXISTS=floor -Wl,-z,relro -Wl,-z,now -Wl,--as-needed    -L/usr/aarch64-linux-gnu/usr/lib   -rdynamic CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o -o cmTC_d867c   && :
/usr/lib/gcc/aarch64-linux-gnu/10.2.1/../../../../aarch64-linux-gnu/bin/ld: CMakeFiles/cmTC_d867c.dir/CheckFunctionExists.c.o: in function `main':
CheckFunctionExists.c:(.text.startup+0x14): undefined reference to `floor'
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.

This for example.

I mean there are a lot of subcommand failed but is this stopping the compiler? There are some optional dependency checks too, which are resulting in errors.

Full CMakeError.log is here: https://gist.github.com/Veganizer/33ffe4401b28c2d7ac33d5605de99744

Following error it gots in the end:

=> ERROR: mariadb-10.5.9_2: do_configure: 'CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}' exited with 1
=> ERROR:   in do_configure() at common/build-style/cmake.sh:67

@Veganizer Veganizer force-pushed the mariadb-server branch 6 times, most recently from 4dda5b3 to 466c0ca Compare April 11, 2021 09:16
@Veganizer Veganizer force-pushed the mariadb-server branch 19 times, most recently from fa6c3c1 to 85b206c Compare April 11, 2021 13:41
@Johnnynator Johnnynator merged commit 7334ca8 into void-linux:master Apr 15, 2021
@Veganizer Veganizer deleted the mariadb-server branch May 11, 2021 08:22
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants