Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
466c83e3
Commit
466c83e3
authored
Sep 24, 2020
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5/crash_test: configure mariadb with debug enabled
https://mariadb.com/kb/en/compiling-mariadb-for-debugging/
parent
84e6ea94
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
39 deletions
+54
-39
software/erp5/crash_test/0001-Workaround-double-definiton-of-openssl-1.11-macros.patch
...-Workaround-double-definiton-of-openssl-1.11-macros.patch
+49
-0
software/erp5/crash_test/software.cfg
software/erp5/crash_test/software.cfg
+5
-39
No files found.
software/erp5/crash_test/0001-Workaround-double-definiton-of-openssl-1.11-macros.patch
0 → 100644
View file @
466c83e3
From 47d01e14c26855323fba181936a77643e963d5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 24 Sep 2020 08:52:07 +0200
Subject: [PATCH] Workaround double definiton of openssl 1.11 macros
---
mysys_ssl/openssl.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c
index e0f3d646ca9..9d1067a377b 100644
--- a/mysys_ssl/openssl.c
+++ b/mysys_ssl/openssl.c
@@ -30,8 +30,32 @@
int check_openssl_compatibility()
return 0;
}
#else
+
+// XXX workaround double definition of these macros ( in ssl_compat.h and openssl/evp.h )
+#undef EVP_MD_CTX_init
+#undef EVP_CIPHER_CTX_init
+#undef ERR_free_strings
+#undef EVP_cleanup
+#undef CRYPTO_cleanup_all_ex_data
+#undef SSL_load_error_strings
+
#include <openssl/evp.h>
+// XXX workaround double definition macros continued
+#undef EVP_MD_CTX_init
+#define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
+#undef EVP_CIPHER_CTX_init
+#define EVP_CIPHER_CTX_init(X) do { memset((X), 0, EVP_CIPHER_CTX_SIZE); EVP_CIPHER_CTX_reset(X); } while(0)
+#undef ERR_free_strings
+#define ERR_free_strings()
+#undef EVP_cleanup
+#define EVP_cleanup()
+#undef CRYPTO_cleanup_all_ex_data
+#define CRYPTO_cleanup_all_ex_data()
+#undef SSL_load_error_strings
+#define SSL_load_error_strings()
+
+
static uint testing;
size_t alloc_size, alloc_count;
--
2.25.1
software/erp5/crash_test/software.cfg
View file @
466c83e3
...
...
@@ -6,43 +6,12 @@ repository = /srv/slapgrid/slappart4/srv/project/erp5/
branch = wip/scalability_crash_mariadb
develop = true
# https://mariadb.com/kb/en/compiling-mariadb-for-debugging/
[mariadb]
version = 10.3.24
url = https://downloads.mariadb.org/f/mariadb-10.3.24/source/mariadb-10.3.24.tar.gz/from/https%3A//mirrors.piconets.webwerks.in/mariadb-mirror/?serve
md5sum = 629a4c66a76c1c7ce59ac3eb42924d26
Xpre-configure =
set -e '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
grep -q "$@"
sed -i "/$1/d" "$2"
post-install =
ldd=`ldd ${:location}/lib/plugin/ha_rocksdb.so`
for x in ${lz4:location} ${snappy:location} ${zstd:location}
do echo "$ldd" |grep -qF " $x/lib/"
done
mkdir -p ${:location}/include/wsrep &&
cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
[mroonga-mariadb]
pre-configure = set -e
rm -rf fake_mariadb_source
mkdir -p fake_mariadb_source
test -d ${mariadb:location}/include/mysql/server/private && (
mkdir -p fake_mariadb_source/sql
cp -a ${mariadb:location}/include/mysql/server/private/* fake_mariadb_source/sql
cp -a ${mariadb:location}/include/mysql/server/*.h fake_mariadb_source/sql
cp -a ${mariadb:location}/include/mysql/server/mysql fake_mariadb_source/sql
) || ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
cp -ar ${mariadb:location}/include fake_mariadb_source/include
! test -f fake_mariadb_source/include/mysql/mariadb_stmt.h ||
sed -i -E -e '/^enum enum_(cursor|indicator)_type$/,/};/d' fake_mariadb_source/include/mysql/mariadb_stmt.h
mkdir -p ${:plugin-dir}
# https://mariadb.com/kb/en/compiling-mariadb-for-debugging/
configure-options +=
-DCMAKE_BUILD_TYPE=Debug
patches +=
${:_profile_base_location_}/0001-Workaround-double-definiton-of-openssl-1.11-macros.patch#ef2da5cfe303978f132601a78e239b32
; XXX don't share during dev
[mariadb]
...
...
@@ -50,6 +19,3 @@ shared = false
[mroonga-mariadb]
shared = false
[xxx]
xxx = ${mariadb:patch-options}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment