Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mariadb
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
mariadb
Commits
085365b0
Commit
085365b0
authored
Nov 05, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed location of PCRE2 after ftp.pcre.org was retired
parent
4612fb86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
Makefile
Makefile
+3
-0
mariadb-10.5.8-fix_pcre2_download.patch
mariadb-10.5.8-fix_pcre2_download.patch
+12
-0
No files found.
Makefile
View file @
085365b0
...
...
@@ -27,6 +27,7 @@ all: client-cnf mysql-clients-cnf server-cnf mariadb-config
mv
-v
/etc/gshadow
/data/etc/gshadow
ln
-sv
/data/etc/gshadow
/etc/gshadow
tar
xf
mariadb-10.5.8.tar.gz
patch
-Np1
-d
mariadb-10.5.8
<
mariadb-10.5.8-fix_pcre2_download.patch
cd
mariadb-10.5.8
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
mkdir
mariadb-10.5.8/build
cd
mariadb-10.5.8/build
&&
cmake
-DCMAKE_BUILD_TYPE
=
Release
-DINSTALL_LAYOUT
=
DEB
-DINSTALL_SYSCONF2DIR
=
/etc/my.cnf.d
-DWITH_EXTRA_CHARSETS
=
complex
-DSKIP_TESTS
=
ON
-DTOKUDB_OK
=
0
-DWITH_WSREP
=
ON
-DWITH_INNODB_DISALLOW_WRITES
=
ON ..
...
...
@@ -165,6 +166,7 @@ client: mysql-config
swapon swap
tar
xf
mariadb-10.5.8.tar.gz
patch
-Np1
-d
mariadb-10.5.8
<
mariadb-10.5.8-fix_pcre2_download.patch
patch
-Np1
-d
mariadb-10.5.8
<
mariadb-10.5.8-without_server_fix.patch
cd
mariadb-10.5.8
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
mkdir
mariadb-10.5.8/build
...
...
@@ -202,6 +204,7 @@ temporary:
swapon swap
tar
xf
mariadb-10.5.8.tar.gz
patch
-Np1
-d
mariadb-10.5.8
<
mariadb-10.5.8-fix_pcre2_download.patch
cd
mariadb-10.5.8
&&
sed
-i
"s@data/test@\$${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt
mkdir
mariadb-10.5.8/build
cd
mariadb-10.5.8/build
&&
cmake
-DCMAKE_BUILD_TYPE
=
MinSizeRel
-DCMAKE_INSTALL_PREFIX
=
/build/usr
-DINSTALL_DOCDIR
=
share/doc/mariadb-10.5.8
-DINSTALL_DOCREADMEDIR
=
share/doc/mariadb-10.5.8
-DINSTALL_MANDIR
=
share/man
-DINSTALL_MYSQLSHAREDIR
=
share/mysql
-DINSTALL_MYSQLTESTDIR
=
share/mysql/test
-DINSTALL_PLUGINDIR
=
lib/mysql/plugin
-DINSTALL_SBINDIR
=
sbin
-DINSTALL_SCRIPTDIR
=
bin
-DINSTALL_SQLBENCHDIR
=
share/mysql/bench
-DINSTALL_SUPPORTFILESDIR
=
share/mysql
-DMYSQL_DATADIR
=
/build/var/lib/mysql
-DMYSQL_UNIX_ADDR
=
/run/mysql.sock
-DWITH_EXTRA_CHARSETS
=
complex
-DSKIP_TESTS
=
ON
-DTOKUDB_OK
=
0 ..
...
...
mariadb-10.5.8-fix_pcre2_download.patch
0 → 100644
View file @
085365b0
diff -uNr mariadb-10.5.8/cmake/pcre.cmake mariadb-10.5.8-fix_pcre2_download/cmake/pcre.cmake
--- mariadb-10.5.8/cmake/pcre.cmake 2020-11-10 23:44:53.000000000 +1030
+++ mariadb-10.5.8-fix_pcre2_download/cmake/pcre.cmake 2021-11-05 20:12:37.509572882 +1030
@@ -36,7 +36,7 @@
ExternalProject_Add(
pcre2
PREFIX "${dir}"
- URL "http://ftp.pcre.org/pub/pcre/pcre2-10.34.zip"
+ URL "https://sourceforge.net/projects/pcre/files/pcre2/10.34/pcre2-10.34.zip"
URL_MD5 fdb10dba7f3be43730966bebdd3755ef
INSTALL_COMMAND ""
CMAKE_ARGS
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