summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-08-11 16:04:05 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-08-12 13:54:53 +0200
commit388c51030b3bac0d58952c9334045d8574276c8b (patch)
tree887b4c3c06dc10e400bee00f5e86996ab2afa644
parent292171bc4d23936908d2c22b65742fb1881d4427 (diff)
downloadnet-388c51030b3bac0d58952c9334045d8574276c8b.tar.gz
net-388c51030b3bac0d58952c9334045d8574276c8b.tar.xz
mariadb: Version bump to 10.1.26
-rw-r--r--packages/dev-db/mariadb/files/mariadb-Allow-build-a-system-snappy.patch29
-rw-r--r--packages/dev-db/mariadb/mariadb-10.1.26.exheres-0 (renamed from packages/dev-db/mariadb/mariadb-10.1.25.exheres-0)0
2 files changed, 16 insertions, 13 deletions
diff --git a/packages/dev-db/mariadb/files/mariadb-Allow-build-a-system-snappy.patch b/packages/dev-db/mariadb/files/mariadb-Allow-build-a-system-snappy.patch
index e9bcfc6..464ab9f 100644
--- a/packages/dev-db/mariadb/files/mariadb-Allow-build-a-system-snappy.patch
+++ b/packages/dev-db/mariadb/files/mariadb-Allow-build-a-system-snappy.patch
@@ -5,23 +5,23 @@ Upstream: Not yet, this needs adjustment to make the choice between
and serveral CVEs fixed by this version bump, I decided to
add the patch nevertheless.
-From 6f9ec416884a7792831c5c9c020068ec4684428f Mon Sep 17 00:00:00 2001
+From 35d7fa2c7d6a719796773217630209139b6cf918 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Sun, 21 Feb 2016 12:38:27 +0100
Subject: [PATCH] Allow build a system snappy
---
- .../PerconaFT/cmake_modules/TokuThirdParty.cmake | 35 +---------------------
+ .../PerconaFT/cmake_modules/TokuThirdParty.cmake | 38 +---------------------
storage/tokudb/PerconaFT/ft/CMakeLists.txt | 8 ++---
storage/tokudb/PerconaFT/src/CMakeLists.txt | 4 +--
storage/tokudb/PerconaFT/tools/CMakeLists.txt | 2 +-
- 4 files changed, 8 insertions(+), 41 deletions(-)
+ 4 files changed, 8 insertions(+), 44 deletions(-)
diff --git a/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake b/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-index a2c3103..b287b60 100644
+index 9769b7db13d..b287b60e9ac 100644
--- a/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
+++ b/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-@@ -106,37 +106,4 @@ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
+@@ -106,40 +106,4 @@ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
add_dependencies(lzma build_lzma)
@@ -42,6 +42,9 @@ index a2c3103..b287b60 100644
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+- -DCMAKE_AR=${CMAKE_AR}
+- -DCMAKE_NM=${CMAKE_NM}
+- -DCMAKE_RANLIB=${CMAKE_RANLIB}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- ${USE_PROJECT_CMAKE_MODULE_PATH}
@@ -61,10 +64,10 @@ index a2c3103..b287b60 100644
-add_dependencies(snappy build_snappy)
+find_package(Snappy)
diff --git a/storage/tokudb/PerconaFT/ft/CMakeLists.txt b/storage/tokudb/PerconaFT/ft/CMakeLists.txt
-index 744b9c9..8df9cfa 100644
+index 6696c26ecc0..10bce9a4622 100644
--- a/storage/tokudb/PerconaFT/ft/CMakeLists.txt
+++ b/storage/tokudb/PerconaFT/ft/CMakeLists.txt
-@@ -84,12 +84,12 @@ set_target_properties(ft_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
+@@ -85,12 +85,12 @@ set_target_properties(ft_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
maybe_add_gcov_to_libraries(ft ft_static)
## depend on other generated targets
@@ -82,7 +85,7 @@ index 744b9c9..8df9cfa 100644
add_subdirectory(tests)
diff --git a/storage/tokudb/PerconaFT/src/CMakeLists.txt b/storage/tokudb/PerconaFT/src/CMakeLists.txt
-index 65bf481..23083d4 100644
+index 65bf4814cf8..23083d4ae6a 100644
--- a/storage/tokudb/PerconaFT/src/CMakeLists.txt
+++ b/storage/tokudb/PerconaFT/src/CMakeLists.txt
@@ -18,14 +18,14 @@ set(tokudb_srcs
@@ -103,18 +106,18 @@ index 65bf481..23083d4 100644
## add gcov and define _GNU_SOURCE
diff --git a/storage/tokudb/PerconaFT/tools/CMakeLists.txt b/storage/tokudb/PerconaFT/tools/CMakeLists.txt
-index af82b43..e4110a0 100644
+index e6540bf69be..a27e5bb2841 100644
--- a/storage/tokudb/PerconaFT/tools/CMakeLists.txt
+++ b/storage/tokudb/PerconaFT/tools/CMakeLists.txt
-@@ -4,7 +4,7 @@ set(tools tokudb_dump tokuftdump tokuft_logprint tdb-recover ftverify ba_replay)
+@@ -4,7 +4,7 @@ set(tools tokudb_dump tokuftdump tokuft_logprint tdb-recover ftverify)
foreach(tool ${tools})
add_executable(${tool} ${tool}.cc)
add_dependencies(${tool} install_tdb_h)
- target_link_libraries(${tool} ${LIBTOKUDB}_static ft_static z lzma snappy ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
+ target_link_libraries(${tool} ${LIBTOKUDB}_static ft_static z lzma ${SNAPPY_LIBRARIES} ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
- add_space_separated_property(TARGET ${tool} COMPILE_FLAGS -fvisibility=hidden)
- endforeach(tool)
+ # detect when we are being built as a subproject
+ if (DEFINED MYSQL_PROJECT_NAME_DOCSTRING)
--
-2.7.1
+2.14.1
diff --git a/packages/dev-db/mariadb/mariadb-10.1.25.exheres-0 b/packages/dev-db/mariadb/mariadb-10.1.26.exheres-0
index 3a3c9fc..3a3c9fc 100644
--- a/packages/dev-db/mariadb/mariadb-10.1.25.exheres-0
+++ b/packages/dev-db/mariadb/mariadb-10.1.26.exheres-0