daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

mariadb: updated to version 11.2.3

Browse Source
This commit is contained in:
Juergen Daubert 2024-02-08 11:21:40 +01:00
parent d3b2b0f170
commit da428175c4
4 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mariadb/.footprint
View File

@ -326,6 +326,7 @@ drwxr-xr-x root/root usr/include/mysql/server/private/atomic/
-rw-r--r-- root/root usr/include/mysql/server/private/log.h -rw-r--r-- root/root usr/include/mysql/server/private/log.h
-rw-r--r-- root/root usr/include/mysql/server/private/log_cache.h -rw-r--r-- root/root usr/include/mysql/server/private/log_cache.h
-rw-r--r-- root/root usr/include/mysql/server/private/log_event.h -rw-r--r-- root/root usr/include/mysql/server/private/log_event.h
-rw-r--r-- root/root usr/include/mysql/server/private/log_event_data_type.h
-rw-r--r-- root/root usr/include/mysql/server/private/log_slow.h -rw-r--r-- root/root usr/include/mysql/server/private/log_slow.h
-rw-r--r-- root/root usr/include/mysql/server/private/maria.h -rw-r--r-- root/root usr/include/mysql/server/private/maria.h
-rw-r--r-- root/root usr/include/mysql/server/private/mariadb.h -rw-r--r-- root/root usr/include/mysql/server/private/mariadb.h
@ -435,6 +436,7 @@ drwxr-xr-x root/root usr/include/mysql/server/private/providers/lzo/
-rw-r--r-- root/root usr/include/mysql/server/private/set_var.h -rw-r--r-- root/root usr/include/mysql/server/private/set_var.h
-rw-r--r-- root/root usr/include/mysql/server/private/simple_tokenizer.h -rw-r--r-- root/root usr/include/mysql/server/private/simple_tokenizer.h
-rw-r--r-- root/root usr/include/mysql/server/private/slave.h -rw-r--r-- root/root usr/include/mysql/server/private/slave.h
-rw-r--r-- root/root usr/include/mysql/server/private/socketpair.h
-rw-r--r-- root/root usr/include/mysql/server/private/source_revision.h -rw-r--r-- root/root usr/include/mysql/server/private/source_revision.h
-rw-r--r-- root/root usr/include/mysql/server/private/sp.h -rw-r--r-- root/root usr/include/mysql/server/private/sp.h
-rw-r--r-- root/root usr/include/mysql/server/private/sp_cache.h -rw-r--r-- root/root usr/include/mysql/server/private/sp_cache.h

9
mariadb/.signature
View File

@ -1,8 +1,9 @@
untrusted comment: verify with /etc/ports/opt.pub untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/dBonXlNvvGOv1PHV9oIj5zINCunSw6Gy5rLxndahTC3nIsK9fus8LLGp0GdqKOckz7XUFc08qQmQHN+zfgqqw8= RWSE3ohX2g5d/bOqcaX2dyqAq28/Sk57fw+WWCimeyKbF5w+bP2elyqMbTpBBmx5qnOyGZlvDGcGVIZYw6wZEwhVCtU/LsSrzQQ=
SHA256 (Pkgfile) = ab9110eec91f90b1cac52b6bc54f29f60a4b19cddd839cb4b9c5b52d41ccdc1d SHA256 (Pkgfile) = 6ac5685b909c7f16b762a54d0c4f820d2e42792bce5a90698759cf5b880a9430
SHA256 (.footprint) = a98d8ff04f3a5d5fb9306a8733cba42abbfa074d64de76b1a927eddc6cafb1d3 SHA256 (.footprint) = 4c46dc76d604c764779a5c8c3934d00a4e938f8c9d45d3892ca33171fbf7a427
SHA256 (mariadb-11.2.2.tar.gz) = faedbd8790c7ee65b348c0169706b4bae91eb6ce7335a76b27dbd8813c42e21b SHA256 (mariadb-11.2.3.tar.gz) = 14a0bba0c2847eb3f69a4637f55798f8abe10904cd1dd22899c9b0a39c43e35f
SHA256 (mariadb.rc) = 176aefb898a408d17f920b69582caed803cd338db48bcf9dadad59074a5b582d SHA256 (mariadb.rc) = 176aefb898a408d17f920b69582caed803cd338db48bcf9dadad59074a5b582d
SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891 SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891
SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c
SHA256 (libfmt.patch) = 62243984cd3461240439cb23e76323536540b06725a4d92307d2eb6eec68861c

8
mariadb/Pkgfile
View File

@ -4,13 +4,16 @@
# Depends on: fmt libaio libpcre2 linux-pam ncurses openssl zlib # Depends on: fmt libaio libpcre2 linux-pam ncurses openssl zlib
name=mariadb name=mariadb
version=11.2.2 version=11.2.3
release=1 release=1
source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.tar.gz source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.tar.gz
mariadb.rc mariadb.pam mariadb.rc mariadb.pam
pre-install) pre-install
libfmt.patch)
build() { build() {
patch -d $name-$version/cmake -i $SRC/libfmt.patch
cmake -S $name-$version -B build -G Ninja \ cmake -S $name-$version -B build -G Ninja \
-D CMAKE_BUILD_TYPE=Release \ -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
@ -28,6 +31,7 @@ build() {
-D WITH_SSL=system \ -D WITH_SSL=system \
-D WITH_PCRE=system \ -D WITH_PCRE=system \
-D WITH_LIBFMT=system \ -D WITH_LIBFMT=system \
-D WITH_SYSTEMD=no \
-D WITH_EXTRA_CHARSETS=complex \ -D WITH_EXTRA_CHARSETS=complex \
-D WITH_EMBEDDED_SERVER=ON \ -D WITH_EMBEDDED_SERVER=ON \
-D WITH_UNIT_TESTS=OFF \ -D WITH_UNIT_TESTS=OFF \

29
mariadb/libfmt.patch Normal file
View File

@ -0,0 +1,29 @@
--- libfmt.cmake.23 2024-02-02 17:48:45.000000000 +0100
+++ libfmt.cmake 2023-11-19 08:41:55.000000000 +0100
@@ -1,4 +1,4 @@
-INCLUDE (CheckCXXSourceRuns)
+INCLUDE (CheckCXXSourceCompiles)
INCLUDE (ExternalProject)
SET(WITH_LIBFMT "auto" CACHE STRING
@@ -27,15 +27,17 @@
MACRO (CHECK_LIBFMT)
IF(WITH_LIBFMT STREQUAL "system" OR WITH_LIBFMT STREQUAL "auto")
SET(CMAKE_REQUIRED_INCLUDES ${LIBFMT_INCLUDE_DIR})
- CHECK_CXX_SOURCE_RUNS(
+ CHECK_CXX_SOURCE_COMPILES(
"#define FMT_STATIC_THOUSANDS_SEPARATOR ','
#define FMT_HEADER_ONLY 1
#include <fmt/format-inl.h>
+ #include <iostream>
int main() {
- int answer= 4321;
+ int answer= 42;
fmt::format_args::format_arg arg=
fmt::detail::make_arg<fmt::format_context>(answer);
- return fmt::vformat(\"{:L}\", fmt::format_args(&arg, 1)).compare(\"4,321\");
+ std::cout << fmt::vformat(\"The answer is {}.\",
+ fmt::format_args(&arg, 1));
}" HAVE_SYSTEM_LIBFMT)
SET(CMAKE_REQUIRED_INCLUDES)
ENDIF()