On 8/11/2021 6:39 AM, Stuart Henderson wrote:
+CC maintainer
On 2021/08/11 07:44, [email protected] wrote:
Forgot to say I'm running 6.9-stable.
After installing the libexecinfo port mysqld_upgrade works.
On 2021-08-11 06:56, Matthias Pressfreund wrote:
After upgrading mariadb-server, I usually run mariadb-upgrade.
This time, after upgrading to mariadb-server-10.5.12v1, I got
this:
# mariadb-upgrade
ld.so: mariadb-upgrade: can't load library 'libexecinfo.so.2.0'
Killed
Did I miss something?
Looks like you've built this yourself on a machine with libexecinfo
installed and moved the package to another machine without it,
and the reworking of MariaDB's cmake checks has stopped the "force
disabling libexecinfo if it is installed" CONFIGURE_ARGS from working.
Brad, OK for this as a quick fix (seeing as we only need something
short-term) or do you want to handle it differently?
Ya, go with this for now.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.105.2.3
diff -u -p -r1.105.2.3 Makefile
--- Makefile 10 Aug 2021 21:34:12 -0000 1.105.2.3
+++ Makefile 11 Aug 2021 10:38:59 -0000
@@ -9,6 +9,7 @@ DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
PKGNAME-tests= mariadb-tests-${VERSION}
+REVISION= 0
EPOCH= 1
# libiconv dep was removed post-6.8
# keep REVISION in -current above -stable until 6.9
@@ -95,10 +96,6 @@ CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="
# force disabling the PAM auth plugin if OpenPAM is installed
CONFIGURE_ARGS+=-DHAVE_PAM_APPL_H=0
-
-# force disabling libexecinfo if it is installed
-CONFIGURE_ARGS+=-DHAVE_EXECINFO_H=0 \
- -DHAVE_LIBEXECINFO=0
# The ColumnStore, Mroonga, RocksDB, and TokuDB storage engines are disabled.
# ColumnStore is only buildable on X86.
Index: patches/patch-cmake_os_OpenBSD_cmake
===================================================================
RCS file: patches/patch-cmake_os_OpenBSD_cmake
diff -N patches/patch-cmake_os_OpenBSD_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_os_OpenBSD_cmake 11 Aug 2021 10:38:59 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+force disabling libexecinfo if it is installed
+
+Index: cmake/os/OpenBSD.cmake
+--- cmake/os/OpenBSD.cmake.orig
++++ cmake/os/OpenBSD.cmake
+@@ -16,7 +16,7 @@
+ # This file includes OpenBSD specific options and quirks, related to system
checks
+
+ # Find libexecinfo (library that contains backtrace_symbols etc)
+-FIND_LIBRARY(EXECINFO NAMES execinfo)
+-IF(EXECINFO)
+- SET(LIBEXECINFO ${EXECINFO})
+-ENDIF()
++#FIND_LIBRARY(EXECINFO NAMES execinfo)
++#IF(EXECINFO)
++# SET(LIBEXECINFO ${EXECINFO})
++#ENDIF()
