On Fri, Jun 26, 2020 at 02:46:42AM -0600, Stuart Henderson wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: st...@cvs.openbsd.org 2020/06/26 02:46:42
>
> Modified files:
> databases/mariadb: Makefile distinfo
> databases/mariadb/patches: patch-client_CMakeLists_txt
> patch-cmake_install_macros_cmake
> patch-libmariadb_libmariadb_CMakeLists_txt
> patch-libmariadb_libmariadb_ma_charset_c
>
> patch-libmariadb_mariadb_config_mariadb_config_c_in
>
> patch-libmariadb_unittest_libmariadb_CMakeLists_txt
> patch-scripts_CMakeLists_txt
> patch-scripts_mysqld_safe_sh
> databases/mariadb/pkg: PLIST-main PLIST-server PLIST-tests
> Added files:
> databases/mariadb/patches: patch-support-files_CMakeLists_txt
> Removed files:
> databases/mariadb/patches: patch-sql_CMakeLists_txt
>
> Log message:
> update to MariaDB 10.5.4, from Brad.
> move mytop from -server to -main
The build of this on sparc64 is dying:
FAILED: storage/perfschema/CMakeFiles/perfschema.dir/cursor_by_account.cc.o
/usr/obj/ports/mariadb-10.5.4/bin/c++ -DDBUG_TRACE -DHAVE_CONFIG_H -DHAVE_OPENS
SL -DMYSQL_SERVER -I/usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/wsrep-lib/inclu
de -I/usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/wsrep-lib/wsrep-API/v26 -Iincl
ude -I/usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4 -I/usr/obj/ports/mariadb-10.5
.4/mariadb-10.5.4/include -I/usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/sql -Is
ql -Istorage/perfschema -O2 -pipe -I/usr/local/include -pie -fPIC -Wl,-z,relro,
-z,now -fstack-protector --param=ssp-buffer-size=4 -DNDEBUG -D_FORTIFY_SOURCE=2
-DDBUG_OFF -fvisibility=hidden -std=gnu++11 -MD -MT storage/perfschema/CMakeF
iles/perfschema.dir/cursor_by_account.cc.o -MF storage/perfschema/CMakeFiles/per
fschema.dir/cursor_by_account.cc.o.d -o storage/perfschema/CMakeFiles/perfschema
.dir/cursor_by_account.cc.o -c /usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/stor
age/perfschema/cursor_by_account.cc
In file included from /usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/storage/perfs
chema/pfs.h:34,
from /usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/storage/perfs
chema/pfs_buffer_container.h:27,
from /usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/storage/perfs
chema/cursor_by_account.cc:30:
/usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/storage/perfschema/my_thread.h: In
function 'my_thread_os_id_t my_thread_os_id()':
/usr/obj/ports/mariadb-10.5.4/mariadb-10.5.4/storage/perfschema/my_thread.h:68:2
2: error: invalid conversion from 'pthread_t' {aka 'pthread*'} to 'my_thread_os_
id_t' {aka 'unsigned int'} [-fpermissive]
return pthread_self();
~~~~~~~~~~~~^~
ninja: build stopped: subcommand failed.
--Kurt
