From nobody Thu Feb 24 06:52:15 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4DBB419DFB95; Thu, 24 Feb 2022 06:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K43Vl6Jrgz4qMN; Thu, 24 Feb 2022 06:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645685535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mvkDs7apb9c/a9j01qIpM6wW+F9QuqyYpaB+OBxE46o=; b=XNPDyd/v3DqJlqZEcwqLKr7J0l9f2aYtshGzBJNQJ6LgjzjcVP9mBDOjabc5+BWQXPjEZF /NXJ2PHGnC7lOybxA+9fC9Iv3GLgx9rQSVygD0b78Mt/3eV79abQSHm0a2KtTOPHbW0xYa 2/HpIOqE/DOvgybfRNWHfR6Dd6JpxZ9HXwYZATs0i5CjPdknB7sAVcSK5+UTXTl2BIifdx rfiDDG0U19l5fZE7O4FV69io3E23ZfWTPrNB3+92B6yNGXeVUPUjE4rH3NzVs+yKpPTiFM EhFGo+L8hRzixjHDDhnPrmWRjH1yVCtj5JD6odwz0aRwrlLZzTdugKOIEDQxIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B57BA27680; Thu, 24 Feb 2022 06:52:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21O6qF6q047043; Thu, 24 Feb 2022 06:52:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21O6qFxB047042; Thu, 24 Feb 2022 06:52:15 GMT (envelope-from git) Date: Thu, 24 Feb 2022 06:52:15 GMT Message-Id: <202202240652.21O6qFxB047042@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 2ad588ce2c1b - main - databases/mariadb106-server: fix build on riscv64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ad588ce2c1bd3850e77b0cbc350a9c4deecae95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645685535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mvkDs7apb9c/a9j01qIpM6wW+F9QuqyYpaB+OBxE46o=; b=tv3Zdvx5sPtY/iWwQ02XatvgZLdPVW/0SbDsRzNYpvxgkpNi/B9eh7tepIQfOJrdK85EDw tMdCLRwrmlMMcxM45t1Wb+utEvhYkAskP0bPUxyczsNnPQu+bdP+Jpl2HsrGr6kul3zi6+ CTxOt/M6C9qTba2kk3QBr3qVJULTwGnk4RIz6iUbg7U6kjffekJVULd/2TA09obvZwxqKm 5W7dlVv5WJzT6PUkugriMmyb8iI0aMz0Jk0JkvrVWRGPDW5NUkM2fsWxeqxMXpUqDb14AJ gqTGaTrNqX8bW8UAT0VJ8lYCYCfgjDVu0WboJAUWDlER8W4jR7JMNUxr84uckQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645685535; a=rsa-sha256; cv=none; b=wrM71yzgMXpxbzAe/mQY57z/jdbr5C8g8sj8fMl5CMH4aa1HI82nJxfXEkyRYHFXb7ehcf J9GJCZChzACCz3Lo5QI318YCtcvbPQVOU6ulHeIT49I7VvXZfxhvGEph2Hn4prN+KV1yGa yrfuP5KgKalqswQmX4XcacDtkvNqyQIrEbPJ8zitboiJ8EkvT0PZVp/WxfUO0Ww9Fjdn0k LVBAnqLrb11AnuOcrHgkVRxX6MwfW7yd/ZmPl0rxJNS3XGBnfwS3kPqfOKxwkhg81V4GUl W47TiEJpFTpmd4sLNILZTsIMQeN9hWbfGJUKiR4RYUobyL7sVy675VaY2IMSDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ad588ce2c1bd3850e77b0cbc350a9c4deecae95 commit 2ad588ce2c1bd3850e77b0cbc350a9c4deecae95 Author: Piotr Kubaj AuthorDate: 2022-02-24 06:46:57 +0000 Commit: Piotr Kubaj CommitDate: 2022-02-24 06:46:57 +0000 databases/mariadb106-server: fix build on riscv64 Copy patch from databases/mariadb105-server. While here, also enable WSREP. --- databases/mariadb106-server/Makefile | 3 +-- .../mariadb106-server/files/patch-sql_mysqld.cc | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index ebe7a3018b21..f2b465bcfbfe 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -20,8 +20,6 @@ COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_riscv64= fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h - LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 # Ugly workaround for MariaDB/CMake library detection @@ -60,6 +58,7 @@ OPTIONS_DEFINE_amd64= WSREP OPTIONS_DEFINE_aarch64= WSREP OPTIONS_DEFINE_powerpc64le= WSREP OPTIONS_DEFINE_powerpc64= WSREP +OPTIONS_DEFINE_riscv64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER OPTIONS_GROUP_GROONGA= ZMQ MSGPACK diff --git a/databases/mariadb106-server/files/patch-sql_mysqld.cc b/databases/mariadb106-server/files/patch-sql_mysqld.cc new file mode 100644 index 000000000000..e433bfc7d450 --- /dev/null +++ b/databases/mariadb106-server/files/patch-sql_mysqld.cc @@ -0,0 +1,20 @@ +--- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC ++++ sql/mysqld.cc +@@ -205,7 +205,7 @@ typedef fp_except fp_except_t; + + inline void setup_fpu() + { +-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) ++#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) + /* We can't handle floating point exceptions with threads, so disable + this on freebsd + Don't fall for overflow, underflow,divide-by-zero or loss of precision. +@@ -218,7 +218,7 @@ inline void setup_fpu() + fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | + FP_X_IMP)); + #endif /* FP_X_DNML */ +-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ ++#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */ + + #ifdef HAVE_FEDISABLEEXCEPT + fedisableexcept(FE_ALL_EXCEPT);