Re: [sparc64] Fix build of databases/mariadb

2022-06-17 Thread Kurt Mosiejczuk
On Fri, Jun 17, 2022 at 06:59:54PM -0400, Brad Smith wrote:
> On Fri, Jun 17, 2022 at 06:05:48PM -0400, Kurt Mosiejczuk wrote:
> > Latest version of this has been failing to buld on sparc64 because
> > pkg_create cannot find the mroonga test files. I'm betting that is a
> > storage engine that won't be built on sparc64 (or 64-bit arches, or ...)

> > Commenting out those two in the PLIST allows it to build again on sparc64.

> > ok?

> > (cc maintainer)

> Here is a proper diff.

That's even better than the slightly different diff I was about to send
(since mine just used REVISION and not REVISION-tests).

Committed.

--Kurt

> Index: Makefile
> ===
> RCS file: /home/cvs/ports/databases/mariadb/Makefile,v
> retrieving revision 1.128
> diff -u -p -u -p -r1.128 Makefile
> --- Makefile  6 Jun 2022 17:35:25 -   1.128
> +++ Makefile  17 Jun 2022 22:33:13 -
> @@ -5,6 +5,7 @@ COMMENT-tests=multithreaded SQL databas
>  VERSION= 10.8.3
>  DISTNAME=mariadb-${VERSION}
>  PKGNAME-main=mariadb-client-${VERSION}
> +REVISION-tests=  0
>  EPOCH=   1
>  
>  CATEGORIES=  databases
> Index: pkg/PFRAG.le-tests
> ===
> RCS file: /home/cvs/ports/databases/mariadb/pkg/PFRAG.le-tests,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PFRAG.le-tests
> --- pkg/PFRAG.le-tests11 Mar 2022 18:31:22 -  1.2
> +++ pkg/PFRAG.le-tests17 Jun 2022 22:55:34 -
> @@ -388,6 +388,7 @@ share/mysql-test/plugin/mroonga/mroonga/
>  
> share/mysql-test/plugin/mroonga/mroonga/storage/r/index_btree_equal_time.result
>  
> share/mysql-test/plugin/mroonga/mroonga/storage/r/index_btree_equal_timestamp.result
>  
> share/mysql-test/plugin/mroonga/mroonga/storage/r/index_btree_normal_column_insert.result
> +share/mysql-test/plugin/mroonga/mroonga/storage/r/index_desc.result
>  share/mysql-test/plugin/mroonga/mroonga/storage/r/index_hash_id_normal.result
>  
> share/mysql-test/plugin/mroonga/mroonga/storage/r/index_hash_id_primary.result
>  share/mysql-test/plugin/mroonga/mroonga/storage/r/index_hash_id_unique.result
> @@ -989,6 +990,7 @@ share/mysql-test/plugin/mroonga/mroonga/
>  share/mysql-test/plugin/mroonga/mroonga/storage/t/index_btree_equal_time.test
>  
> share/mysql-test/plugin/mroonga/mroonga/storage/t/index_btree_equal_timestamp.test
>  
> share/mysql-test/plugin/mroonga/mroonga/storage/t/index_btree_normal_column_insert.test
> +share/mysql-test/plugin/mroonga/mroonga/storage/t/index_desc.test
>  share/mysql-test/plugin/mroonga/mroonga/storage/t/index_hash_id_normal.test
>  share/mysql-test/plugin/mroonga/mroonga/storage/t/index_hash_id_primary.test
>  share/mysql-test/plugin/mroonga/mroonga/storage/t/index_hash_id_unique.test
> Index: pkg/PLIST-tests
> ===
> RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-tests,v
> retrieving revision 1.57
> diff -u -p -u -p -r1.57 PLIST-tests
> --- pkg/PLIST-tests   6 Jun 2022 08:21:02 -   1.57
> +++ pkg/PLIST-tests   17 Jun 2022 22:31:18 -
> @@ -3594,8 +3594,6 @@ share/mysql-test/plugin/metadata_lock_in
>  
> share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/global_read_lock.test
>  
> share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/table_metadata_lock.test
>  
> share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/user_lock.test
> -share/mysql-test/plugin/mroonga/mroonga/storage/r/index_desc.result
> -share/mysql-test/plugin/mroonga/mroonga/storage/t/index_desc.test
>  share/mysql-test/plugin/myisam/
>  share/mysql-test/plugin/myisam/mtr2/
>  share/mysql-test/plugin/myisam/mtr2/README



[sparc64] Fix build of databases/mariadb

2022-06-17 Thread Kurt Mosiejczuk
Latest version of this has been failing to buld on sparc64 because
pkg_create cannot find the mroonga test files. I'm betting that is a
storage engine that won't be built on sparc64 (or 64-bit arches, or ...)

Commenting out those two in the PLIST allows it to build again on sparc64.

ok?

(cc maintainer)

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.128
diff -u -p -r1.128 Makefile
--- Makefile6 Jun 2022 17:35:25 -   1.128
+++ Makefile17 Jun 2022 22:00:57 -
@@ -6,6 +6,7 @@ VERSION=10.8.3
 DISTNAME=  mariadb-${VERSION}
 PKGNAME-main=  mariadb-client-${VERSION}
 EPOCH= 1
+REVISION=  0
 
 CATEGORIES=databases
 MASTER_SITES=  https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
Index: pkg/PLIST-tests
===
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-tests,v
retrieving revision 1.57
diff -u -p -r1.57 PLIST-tests
--- pkg/PLIST-tests 6 Jun 2022 08:21:02 -   1.57
+++ pkg/PLIST-tests 17 Jun 2022 22:01:01 -
@@ -3594,8 +3594,8 @@ share/mysql-test/plugin/metadata_lock_in
 
share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/global_read_lock.test
 
share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/table_metadata_lock.test
 share/mysql-test/plugin/metadata_lock_info/metadata_lock_info/t/user_lock.test
-share/mysql-test/plugin/mroonga/mroonga/storage/r/index_desc.result
-share/mysql-test/plugin/mroonga/mroonga/storage/t/index_desc.test
+@comment share/mysql-test/plugin/mroonga/mroonga/storage/r/index_desc.result
+@comment share/mysql-test/plugin/mroonga/mroonga/storage/t/index_desc.test
 share/mysql-test/plugin/myisam/
 share/mysql-test/plugin/myisam/mtr2/
 share/mysql-test/plugin/myisam/mtr2/README