Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (928221d394f37e0a43d4d889b95bb46fe45730ef)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (928221d394f37e0a43d4d889b95bb46fe45730ef)
  • Date: Tue, 12 Apr 2016 15:30:44 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/mariadb/BUILD | 2 +-
database/mariadb/CONFIGURE | 9 ++++++---
database/mariadb/DEPENDS | 2 +-
database/mariadb/DETAILS | 7 +++++--
database/mariadb/HISTORY | 6 ++++++
database/mariadb/INSTALL | 4 ++--
database/mariadb/PREPARE | 2 +-
database/mariadb/PRE_BUILD | 2 +-
8 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit 928221d394f37e0a43d4d889b95bb46fe45730ef
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mariadb: => 10.1.13

diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index 019f655..39b0f88 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -3,7 +3,7 @@ create_account mariadb &&
OPTS="$MARIADB_OPTS $OPTS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&

-if [[ $MARIADB_BRANCH == 5.5 ]]; then
+if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
if [[ $MARIA_TESTS == n ]]; then
OPTS="-DWITH_UNIT_TESTS=OFF -DINSTALL_MYSQLTESTDIR=OFF $OPTS"
else
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE
index 8945b10..01739a5 100755
--- a/database/mariadb/CONFIGURE
+++ b/database/mariadb/CONFIGURE
@@ -1,4 +1,5 @@
source $GRIMOIRE/config_query_multi.function &&
+source $GRIMOIRE/CMAKE_CONFIGURE &&

# backporting legacy options
if [[ -n "$MADB_OPTS" ]]; then
@@ -7,7 +8,7 @@ if [[ -n "$MADB_OPTS" ]]; then
persistent_remove MADB_OPTS
fi &&

-if [[ $MARIADB_BRANCH == 5.5 ]]; then
+if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
if list_find "$MARIADB_OPTS" "--with-embedded-server"; then
list_remove "MARIADB_OPTS" "--with-embedded-server" &&
list_add "MARIADB_OPTS" "-DWITH_EMBEDDED_SERVER=ON"
@@ -100,7 +101,7 @@ if [[ -n "$MADB_ENGINES" ]]; then
persistent_remove MADB_ENGINES
fi &&

-if [[ $MARIADB_BRANCH == 5.5 ]]; then
+if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
local MARIADB_ENGINES_LIST="archive aria blackhole csv example federated
federatedx heap innobase myisam myisammrg ndbcluster oqgraph partition
perfschema sphinx tokudb xtradb"
else
local MARIADB_ENGINES_LIST="archive aria blackhole csv example federated
federatedx heap ibmdb2i innodb_plugin myisam ndbcluster oqgraph pbxt sphinx
xtradb"
@@ -117,8 +118,10 @@ elif list_find "$MARIADB_ENGINES" "none"; then
MARIADB_ENGINES="none"
fi &&

-if list_find "$MARIADB_ENGINES" "aria" && [[ $MARIADB_BRANCH == 5.5 ]]; then
+if list_find "$MARIADB_ENGINES" "aria";then
+ if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
config_query_option MARIADB_OPTS "Use Aria engine (instead of MyISAM) for
temporary tables?" y \
"-DUSE_ARIA_FOR_TMP_TABLES=ON" \
"-DUSE_ARIA_FOR_TMP_TABLES=OFF"
+ fi
fi
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index ccabcec..e2aa6dd 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -3,7 +3,7 @@ depends procps &&
depends -sub CXX gcc &&
depends bison &&

-if [[ $MARIADB_BRANCH == 5.5 ]]; then
+if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
depends cmake &&

optional_depends readline \
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 47ce9f8..3b7d7d2 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -1,5 +1,8 @@
SPELL=mariadb
-if [[ $MARIADB_BRANCH == 5.3 ]]; then
+if [[ $MARIADB_BRANCH == 10.1 ]]; then
+ VERSION=10.1.13
+
SOURCE_HASH=sha512:fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e
+elif [[ $MARIADB_BRANCH == 5.3 ]]; then
VERSION=5.3.12

SOURCE_HASH=sha512:d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
elif [[ $MARIADB_BRANCH == 5.5 ]]; then
@@ -14,7 +17,7 @@ else
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-if [[ $MARIADB_BRANCH == 5.5 ]]; then
+if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then

SOURCE_URL[0]=http://mirror.netcologne.de/$SPELL/$SPELL-$VERSION/source/$SOURCE
else

SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index f5a8eae3..b567847 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,9 @@
+2016-04-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE DEPENDS BUILD INSTALL CONFIGURE PRE_BUILD: add 10.1 branch
+ * CONFIGURE: add CMAKE_CONFIGURE
+ * INSTALL: use cmake_install
+ * DETAILS: version 10.1.13
+
2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.5.43 (5.5 branch); SECURITY_PATCH++

diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 1db0634..079324e 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -1,5 +1,5 @@
-if [[ $MARIADB_BRANCH == 5.5 ]]; then
- default_install
+if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
+ cmake_install
else
make benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
testroot="${TRACK_ROOT}/usr/share/mysql" \
diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
index 708765d..a715ea3 100755
--- a/database/mariadb/PREPARE
+++ b/database/mariadb/PREPARE
@@ -12,7 +12,7 @@ if spell_ok $SPELL && [[ -z "$MARIADB_BRANCH" ]]; then
local MARIADB_BRANCH="5.2"
fi &&

-prepare_select_branch 5.5 5.3 5.2 &&
+prepare_select_branch 10.1 5.5 5.3 5.2 &&

config_query MARIA_TESTS "Install MariaDB testing utilities?" n &&
config_query MARIA_BENCH "Install MariaDB benchmarking utilities?" n
diff --git a/database/mariadb/PRE_BUILD b/database/mariadb/PRE_BUILD
index c01bcd3..891d5bc 100755
--- a/database/mariadb/PRE_BUILD
+++ b/database/mariadb/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-if [[ $MARIADB_BRANCH != 5.5 ]]; then
+if [[ $MARIADB_BRANCH != 5.5 ]] && [[ $MARIADB_BRANCH != 10.1 ]]; then
sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (928221d394f37e0a43d4d889b95bb46fe45730ef), Treeve Jelbert, 04/12/2016

Archive powered by MHonArc 2.6.24.

Top of Page