[PR PATCH] mariadb: fix cross-compile, fix license, fix xlint

[PR PATCH] mariadb: fix cross-compile, fix license, fix xlint

[sgn]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages mariadb-fix-cross-license-xlint
https://github.com/void-linux/void-packages/pull/22231

mariadb: fix cross-compile, fix license, fix xlint
- I'm not sure if I should remove those copy to sourcedir
- without copy to builddir, cross build will fail
- change license to GPL-2.0-only
- noisy change because of xlint

A patch file from https://github.com/void-linux/void-packages/pull/22231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mariadb-fix-cross-license-xlint-22231.patch --]
[-- Type: text/x-diff, Size: 2466 bytes --]

From 83bc33ee71cd8e2f804992aa42d9769201305667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 23 May 2020 22:29:11 +0700
Subject: [PATCH] mariadb: fix cross-compile

---
 srcpkgs/mariadb/template | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index c0c44217b71..60fb81da3be 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -17,22 +17,23 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
  -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
  -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-lib32disabled=yes
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel"
+hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+ pkg-config"
 makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
  libatomic-devel"
 depends="mariadb-client"
-provides="mysql-${version}_${revision}"
-replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
-system_accounts="mysql"
-mysql_homedir="/var/lib/mysql"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
 homepage="https://mariadb.org/"
-license="GPL-2"
 distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
 checksum=173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88
+lib32disabled=yes
+provides="mysql-${version}_${revision}"
+replaces="mysql>=0"
+conf_files="/etc/mysql/my.cnf"
+system_accounts="mysql"
+mysql_homedir="/var/lib/mysql"
 CFLAGS="-w"
 
 pre_configure() {
@@ -53,10 +54,15 @@ pre_configure() {
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then
+		# CMake complains if those binaries ain't in build
 		cp bin.host/comp_err ${wrksrc}/extra
+		cp bin.host/comp_err ${wrksrc}/build/extra
 		cp bin.host/comp_sql ${wrksrc}/scripts
+		cp bin.host/comp_sql ${wrksrc}/build/scripts
 		cp bin.host/gen_lex_hash ${wrksrc}/sql
+		cp bin.host/gen_lex_hash ${wrksrc}/build/sql
 		cp bin.host/gen_lex_token ${wrksrc}/sql
+		cp bin.host/gen_lex_token ${wrksrc}/build/sql
 		export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql
 	fi
 	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability

Re: mariadb: fix cross-compile, fix license, fix xlint

[newbluemoon]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22231#issuecomment-633090898

Comment:
> - I'm not sure if I should remove those copy to sourcedir

You can. But you also have to adjust the `PATH` below; for some reason it doesn’t work without.
Like here: https://github.com/void-linux/void-packages/pull/21561#issuecomment-629774844
Maybe both PRs can be combined?

Re: [PR PATCH] [Closed]: mariadb: fix cross-compile, fix license, fix xlint

[sgn]

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

There's a closed pull request on the void-packages repository

mariadb: fix cross-compile, fix license, fix xlint
https://github.com/void-linux/void-packages/pull/22231

Description:
- I'm not sure if I should remove those copy to sourcedir
- without copy to builddir, cross build will fail
- change license to GPL-2.0-only
- noisy change because of xlint