From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-965197-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7712D139694
for <garchives@archives.gentoo.org>; Thu, 3 Aug 2017 18:14:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AF790E0EFE;
Thu, 3 Aug 2017 18:14:11 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8D51AE0EFE
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Aug 2017 18:14:11 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 37DD53418CB
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Aug 2017 18:14:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ED86574FA
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Aug 2017 18:14:08 +0000 (UTC)
From: "Brian Evans" <grknight@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" <grknight@gentoo.org>
Message-ID: <1501783981.386bd2fe281cb605ddefb3819a31bfad9a66e3f9.grknight@gentoo>
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
X-VCS-Repository: proj/mysql-extras
X-VCS-Files: 20026_all_mariadb-add-pkgdatadir.patch
X-VCS-Directories: /
X-VCS-Committer: grknight
X-VCS-Committer-Name: Brian Evans
X-VCS-Revision: 386bd2fe281cb605ddefb3819a31bfad9a66e3f9
X-VCS-Branch: master
Date: Thu, 3 Aug 2017 18:14:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3f5851a3-e356-4e2d-8865-ee10f9539fa4
X-Archives-Hash: 2419b4037323c8cfa239c0e358874142
commit: 386bd2fe281cb605ddefb3819a31bfad9a66e3f9
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 3 18:13:01 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug 3 18:13:01 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=386bd2fe
Add Patch such that the INSTALL_MYSQLSHAREDIR is considered for mysql_install_db
20026_all_mariadb-add-pkgdatadir.patch | 37 ++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
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"