From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 4BAB3469719 for ; Thu, 15 Oct 2020 12:29:07 +0300 (MSK) Date: Thu, 15 Oct 2020 12:18:27 +0300 From: Igor Munkin Message-ID: <20201015091827.GA32659@tarantool.org> References: <0a48783b74bcb4fbdb3ff6f3decc79bded564bec.1602663758.git.avtikhon@tarantool.org> <2931a8165c98a278c78de45d7e979f9180840b0a.1602663758.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <2931a8165c98a278c78de45d7e979f9180840b0a.1602663758.git.avtikhon@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v1 2/5] build: set include path to bootstrap.h List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" Cc: tarantool-patches@dev.tarantool.org Sasha, Thanks for the patch! The patch LGTM per se, but this is just a partial fix: there is no need to split this one and the following[1] into separate patches; just move these changes out from gitlab-ci ones. Furthermore, the commit message doesn't relate to the root problem at all. This error occurs when bootstrap.h is generated outside the source directory (as a result of the next patch, right?). So I propose the following: * join this patch with the following[1], since their separation breaks out of source build * write the original purpose for these changes Here is my version, feel free to adjust it on your own: | build: generate bootstrap.h in CMAKE_BINARY_DIR | | Prior to these changes bootstrap.h was generated right in the source | directory even for out of source build. Firstly such approach doesn't | respect the idea of building outside the source files. Furthermore | this leads to build failures when the source directory is located on | read-only file system. | | As a result of the patch bootstrap.h is generated within the build | tree and include directories are adjusted the corresponding way. On 14.10.20, Alexander V. Tikhonov wrote: > Running out-of-source build got the issue: > > /source/src/box/memtx_engine.c:48:23: fatal error: bootstrap.h: No such file or directory > > To fix it added path to the header in cmake file. > > Part of #4968 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4874-out-of-source-build-full-ci > Issue: https://github.com/tarantool/tarantool/issues/4968 > > src/box/CMakeLists.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt > index 8b2e704cf..6e25401a1 100644 > --- a/src/box/CMakeLists.txt > +++ b/src/box/CMakeLists.txt > @@ -77,6 +77,7 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${lua_sources}) > > include_directories(${ZSTD_INCLUDE_DIRS}) > include_directories(${CMAKE_BINARY_DIR}/src/box/sql) > +include_directories(${CMAKE_BINARY_DIR}/src/box) > > add_library(vclock STATIC vclock.c) > target_link_libraries(vclock core bit) > -- > 2.25.1 > [1]: https://lists.tarantool.org/pipermail/tarantool-patches/2020-October/020159.html -- Best regards, IM