diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2021-08-08 11:47:31 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2021-08-29 09:47:27 +0000 |
| commit | 2be507323c227e744abd4c608a52a309d7d4a698 (patch) | |
| tree | b1ac01a6346185ef6994b4ed0f30201df25300f6 | |
| parent | 473e8a2d445f4b60886da0623909b98c29c8a4f0 (diff) | |
| download | ports-2be507323c227e744abd4c608a52a309d7d4a698.tar.gz ports-2be507323c227e744abd4c608a52a309d7d4a698.zip | |
databases/mariadb105-server: Update to 10.5.12
* Update/fix i386 build [1]
PR: 257047 [1]
Reported by: Raymond Quakkelaar <r quakkelaar quaras nl>
Security: 38a4a043-e937-11eb-9b84-d4c9ef517024
(cherry picked from commit aa7bf2b545f6068e84dd0c3dc9e4c85f22a7bc2d)
| -rw-r--r-- | databases/mariadb105-server/Makefile | 10 | ||||
| -rw-r--r-- | databases/mariadb105-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt | 11 |
3 files changed, 7 insertions, 20 deletions
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 20076043c55b..7fc6be271dd8 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,7 +1,7 @@ # Created by: Bernard Spil <brnrd@FreeBSD.org> PORTNAME?= mariadb -PORTVERSION= 10.5.11 +PORTVERSION= 10.5.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -25,7 +25,7 @@ LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 # Ugly workaround for MariaDB/CMake library detection LDFLAGS+= -L${LOCALBASE}/lib -USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl +USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -211,13 +211,11 @@ PLIST_SUB+= WSREP="@comment " .endif .if ${ARCH} == i386 -USE_GCC= 9 -CFLAGS+= -DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE -CXXFLAGS+= -fpermissive +USE_GCC= yes +CFLAGS+= -latomic -fasynchronous-unwind-tables .endif post-patch: - ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index e6392dc83a4c..148012cb3dbe 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624477722 -SHA256 (mariadb-10.5.11.tar.gz) = 761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a -SIZE (mariadb-10.5.11.tar.gz) = 99037098 +TIMESTAMP = 1628155943 +SHA256 (mariadb-10.5.12.tar.gz) = ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd +SIZE (mariadb-10.5.12.tar.gz) = 101914615 diff --git a/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt b/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt deleted file mode 100644 index a00932dc6b01..000000000000 --- a/databases/mariadb105-server/files/patch-storage_mroonga_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/mroonga/CMakeLists.txt.orig 2020-06-23 15:10:17 UTC -+++ storage/mroonga/CMakeLists.txt -@@ -80,7 +80,7 @@ else() - set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) - endif() - --file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) -+file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION) - file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) - file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) - file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) |