Tarantool development patches archive
 help / color / mirror / Atom feed
From: Igor Munkin <imun@tarantool.org>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v1 2/5] build: set include path to bootstrap.h
Date: Thu, 15 Oct 2020 12:18:27 +0300	[thread overview]
Message-ID: <20201015091827.GA32659@tarantool.org> (raw)
In-Reply-To: <2931a8165c98a278c78de45d7e979f9180840b0a.1602663758.git.avtikhon@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

  reply	other threads:[~2020-10-15  9:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-14  8:27 [Tarantool-patches] [PATCH v1 1/5] curl: enable curl build with old cmake Alexander V. Tikhonov
2020-10-14  8:29 ` [Tarantool-patches] [PATCH v1 2/5] build: set include path to bootstrap.h Alexander V. Tikhonov
2020-10-15  9:18   ` Igor Munkin [this message]
2021-03-12  8:55   ` Kirill Yukhin via Tarantool-patches
2020-10-14  8:30 ` [Tarantool-patches] [PATCH v1 3/5] build: correct destination build directory Alexander V. Tikhonov
2020-10-15 12:24   ` Igor Munkin
2020-10-14  8:35 ` [Tarantool-patches] [PATCH v1 5/5] gitlab-ci: add out-of-source build Alexander V. Tikhonov
2020-10-15 12:30   ` [Tarantool-patches] [PATCH v2 " Igor Munkin
2020-10-14  9:25 ` [Tarantool-patches] [PATCH v4 4/5] build: enable cmake in curl build Alexander V. Tikhonov
2020-10-15 14:17   ` Igor Munkin
2020-10-15 19:00     ` Alexander V. Tikhonov
2020-10-15 20:43       ` Igor Munkin
2020-10-15 12:23 ` [Tarantool-patches] [PATCH v1 1/5] curl: enable curl build with old cmake Igor Munkin
2020-10-16  6:55 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201015091827.GA32659@tarantool.org \
    --to=imun@tarantool.org \
    --cc=avtikhon@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1 2/5] build: set include path to bootstrap.h' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox