Fix mariadb with ninja

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Fix mariadb with ninja

David Coppa

Hi!

The diff below fixes ninja build of mariadb.

There's no need to put sql_builtin.cc into GEN_SOURCES:
libmysqld/CMakeLists.txt does the right thing.

Tested in subsequent builds with "-j" up to 4.

Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 4 Sep 2013 19:20:28 -0000 1.5
+++ Makefile 20 Sep 2013 12:38:43 -0000
@@ -47,7 +47,6 @@ LIB_DEPENDS-tests= ${BASE_PKGPATH}>=5.5,
 VMEM_WARNING= Yes
 
 USE_GROFF= Yes
-USE_NINJA= No
 
 CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
  -DINSTALL_DOCDIR="share/doc/mysql" \
Index: patches/patch-sql_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/databases/mariadb/patches/patch-sql_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-sql_CMakeLists_txt
--- patches/patch-sql_CMakeLists_txt 30 May 2013 12:39:18 -0000 1.2
+++ patches/patch-sql_CMakeLists_txt 20 Sep 2013 12:38:43 -0000
@@ -1,6 +1,22 @@
 $OpenBSD: patch-sql_CMakeLists_txt,v 1.2 2013/05/30 12:39:18 brad Exp $
---- sql/CMakeLists.txt.orig Tue May 21 18:09:51 2013
-+++ sql/CMakeLists.txt Fri May 24 19:48:19 2013
+--- sql/CMakeLists.txt.orig Wed Jul 17 16:51:28 2013
++++ sql/CMakeLists.txt Fri Sep 20 14:02:31 2013
+@@ -25,7 +25,6 @@ ${CMAKE_BINARY_DIR}/sql
+ SET(GEN_SOURCES
+ ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.h
+ ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc
+-${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
+ ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
+ )
+
+@@ -60,6 +59,7 @@ SET (SQL_SOURCE
+                sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc
+                sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc
+                sql_list.cc sql_load.cc sql_manager.cc sql_parse.cc
++               ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc
+                sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc
+                debug_sync.cc debug_sync.h
+                sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc
 @@ -268,7 +268,7 @@ ADD_CUSTOM_TARGET(distclean
    VERBATIM
    )