svn commit: r542596 - in head/databases/mariadb105-server: . files
Bernard Spil
brnrd at FreeBSD.org
Sun Jul 19 20:19:56 UTC 2020
Author: brnrd
Date: Sun Jul 19 20:19:54 2020
New Revision: 542596
URL: https://svnweb.freebsd.org/changeset/ports/542596
Log:
databases/mariadb105-server: Fix build for i386
* pet portlint
* i386 requires gcc [1]
* Fix stacktrace [2]
PR: 247535 [1], 247957 [2]
Reported by: Raymond Quakkelaar <r quakkelaar quaras nl> [1], Naram Qashat <cyberbotx cyberbotx com> [2]
Added:
head/databases/mariadb105-server/files/patch-MDEV-15961
- copied, changed from r541969, head/databases/mariadb104-server/files/patch-MDEV-15961
Modified:
head/databases/mariadb105-server/Makefile
head/databases/mariadb105-server/files/mysql-server.in
head/databases/mariadb105-server/pkg-plist
Modified: head/databases/mariadb105-server/Makefile
==============================================================================
--- head/databases/mariadb105-server/Makefile Sun Jul 19 19:14:28 2020 (r542595)
+++ head/databases/mariadb105-server/Makefile Sun Jul 19 20:19:54 2020 (r542596)
@@ -20,16 +20,13 @@ COMMENT?= Multithreaded SQL database (server)
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LICENSE_NAME_PerconaFT= PerconaFT patents license
-LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
-LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32'
+# BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32'
LIB_DEPENDS+= libpcre2-8.so:devel/pcre2
# Ugly workaround for MariaDB/CMake library detection
-CFLAGS+= -L/usr/local/lib
+CFLAGS+= -L${LOCALBASE}/lib
USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
@@ -211,12 +208,16 @@ SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
GSSAPI_BASE_IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
.endif
-.include <bsd.port.pre.mk>
-
.if ${ARCH} != amd64
PLIST_SUB+= WSREP="@comment "
.endif
+.if ${ARCH} == i386
+USE_GCC= yes
+CFLAGS+= -DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE
+CXXFLAGS+= -fpermissive
+.endif
+
post-patch:
${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
.if ${OPSYS} == DragonFly
@@ -232,7 +233,7 @@ post-configure:
${WRKSRC}/scripts/mysql_config.sh
pre-install:
- ${MKDIR} -p ${STAGEDIR}${ETCDIR}/conf.d
+ ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
.if ${PKGNAMESUFFIX:M*-client}
post-install:
@@ -273,7 +274,7 @@ post-install-WSREP-on:
post-install-SPIDER-on:
${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \
${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample
-
+
.endif # ${PKGNAMESUFFIX:M*-client}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/databases/mariadb105-server/files/mysql-server.in
==============================================================================
--- head/databases/mariadb105-server/files/mysql-server.in Sun Jul 19 19:14:28 2020 (r542595)
+++ head/databases/mariadb105-server/files/mysql-server.in Sun Jul 19 20:19:54 2020 (r542596)
@@ -97,9 +97,9 @@ else
fi
pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+command_args="-c -f %%PREFIX%%/bin/mariadb-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
mysql_create_auth_tables()
{
Copied and modified: head/databases/mariadb105-server/files/patch-MDEV-15961 (from r541969, head/databases/mariadb104-server/files/patch-MDEV-15961)
==============================================================================
--- head/databases/mariadb104-server/files/patch-MDEV-15961 Sat Jul 11 13:02:35 2020 (r541969, copy source)
+++ head/databases/mariadb105-server/files/patch-MDEV-15961 Sun Jul 19 20:19:54 2020 (r542596)
@@ -1,9 +1,9 @@
MDEV-15961: Fix stacktraces under FreeBSD
https://jira.mariadb.org/browse/MDEV-15961
---- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC
+--- mysys/stacktrace.c.orig 2020-06-23 15:10:17 UTC
+++ mysys/stacktrace.c
-@@ -34,19 +34,19 @@
+@@ -33,13 +33,13 @@
#include <execinfo.h>
#endif
@@ -19,17 +19,21 @@ https://jira.mariadb.org/browse/MDEV-15961
+#define PTR_SANE(p) (p)
+#endif /* __linux */
- void my_init_stacktrace()
+ /**
+ Default handler for printing stacktrace
+@@ -67,9 +67,9 @@ static sig_handler default_handle_fatal_signal(int sig
+
+ void my_init_stacktrace(int setup_handlers)
{
-#if(defined HAVE_BSS_START) && !(defined __linux__)
+#ifdef __linux__
heap_start = (char*) &__bss_start;
-#endif
+#endif /* __linux__ */
- }
-
- #ifdef __linux__
-@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+ if (setup_handlers)
+ {
+ struct sigaction sa;
+@@ -186,15 +186,16 @@ static int safe_print_str(const char *addr, size_t max
int my_safe_print_str(const char* val, size_t max_len)
{
Modified: head/databases/mariadb105-server/pkg-plist
==============================================================================
--- head/databases/mariadb105-server/pkg-plist Sun Jul 19 19:14:28 2020 (r542595)
+++ head/databases/mariadb105-server/pkg-plist Sun Jul 19 20:19:54 2020 (r542596)
@@ -58,7 +58,8 @@ bin/resolveip
%%ETCDIR%%/conf.d/enable_encryption.preset
@comment %%ETCDIR%%/conf.d/mysql-clients.cnf
@sample %%ETCDIR%%/conf.d/server.cnf.sample
-%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
+%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
+ at comment %%DATADIR%%/wsrep.cnf
%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
@sample %%ETCDIR%%/user_map.conf.sample
@comment data/test/db.opt
More information about the svn-ports-all
mailing list