diff options
| author |   Brian Evans <grknight@gentoo.org> | 2017-08-03 14:13:01 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-08-03 14:13:01 -0400 |
| commit | 386bd2fe281cb605ddefb3819a31bfad9a66e3f9 (patch) | |
| tree | 9458f725e8d288b3b56d0ae85511c8da41d9751b /20026_all_mariadb-add-pkgdatadir.patch | |
| parent | 20025: Additionally add -krb5 to pkg-config part2 (diff) | |
| download | mysql-extras-386bd2fe281cb605ddefb3819a31bfad9a66e3f9.tar.gz mysql-extras-386bd2fe281cb605ddefb3819a31bfad9a66e3f9.tar.bz2 mysql-extras-386bd2fe281cb605ddefb3819a31bfad9a66e3f9.zip | |
Add Patch such that the INSTALL_MYSQLSHAREDIR is considered for mysql_install_dbmysql-extras-20170803-1814Z
Diffstat (limited to '20026_all_mariadb-add-pkgdatadir.patch')
| -rw-r--r-- | 20026_all_mariadb-add-pkgdatadir.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/20026_all_mariadb-add-pkgdatadir.patch b/20026_all_mariadb-add-pkgdatadir.patch new file mode 100644 index 0000000..3e25acc --- /dev/null +++ b/20026_all_mariadb-add-pkgdatadir.patch @@ -0,0 +1,37 @@ +diff -uarN a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in +--- a/scripts/mysql_install_db.pl.in 2017-07-10 06:53:28.000000000 -0400 ++++ b/scripts/mysql_install_db.pl.in 2017-08-03 12:41:39.480556405 -0400 +@@ -320,7 +320,7 @@ + find_in_basedir($opt,"file","mysqld-nt", + "bin"); # ,"sql" + $srcpkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql", +- "share","share/mysql"); # ,"scripts" ++ "@pkgdatadir@","share","share/mysql"); # ,"scripts" + $buildpkgdir = $srcpkgdatadir; + $scriptdir = "$opt->{basedir}/scripts"; + } +diff -uarN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh +--- a/scripts/mysql_install_db.sh 2017-07-10 06:53:28.000000000 -0400 ++++ b/scripts/mysql_install_db.sh 2017-08-03 12:38:26.509073203 -0400 +@@ -312,17 +312,17 @@ + cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin + exit 1 + fi +- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english` ++ langdir=`find_in_basedir --dir errmsg.sys @pkgdatadir@/english share/english share/mysql/english` + if test -z "$langdir" + then +- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english ++ cannot_find_file errmsg.sys $basedir/@pkgdatadir@/english $basedir/share/english $basedir/share/mysql/english + exit 1 + fi +- srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` ++ srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql @pkgdatadir@ share share/mysql` + buildpkgdatadir=$srcpkgdatadir + if test -z "$srcpkgdatadir" + then +- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql ++ cannot_find_file fill_help_tables.sql $basedir/@pkgdatadir@ $basedir/share $basedir/share/mysql + exit 1 + fi + scriptdir="$basedir/scripts" |