[Tarantool-patches] [PATCH 2/2] build: install libCURL headers

Alexander Turenko alexander.turenko at tarantool.org
Wed Mar 31 02:14:02 MSK 2021

LGTM after fixes (no need to re-review with me).

Please, update and proceed with the next reviewer.

On Fri, Mar 19, 2021 at 04:45:55PM +0300, Roman Khabibov wrote:
> Ship libCURL headers to system path "include/tarantool" in the
> case of libCURL included as bundled library or static build.

Please, reflect comments to the first patch here: the library naming,
motivation of the change, the issue number.

Nit: I suggest to refer include directory as
"${PREFIX}/include/tarantool" -- it makes quite clear that it may be
/usr/include/tarantool, /usr/local/include/tarantool or something of
this kind.

> diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md
> new file mode 100755
> index 000000000..4494a14c8
> --- /dev/null
> +++ b/changelogs/unreleased/install-headers.md
> @@ -0,0 +1,4 @@
> +## feature/build
> +
> +* Ship libCURL headers to system path "include/tarantool" in the
> +case of libCURL included as bundled library or static build (gh-####).
> \ No newline at end of file

No newline at end of file.

> diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
> index 92e693955..d19df8925 100644
> --- a/rpm/tarantool.spec
> +++ b/rpm/tarantool.spec
> @@ -268,6 +268,15 @@ fi
>  %{_includedir}/tarantool/luajit.h
>  %{_includedir}/tarantool/lualib.h
>  %{_includedir}/tarantool/module.h
> +%{_includedir}/tarantool/curl/curl.h
> +%{_includedir}/tarantool/curl/curlver.h
> +%{_includedir}/tarantool/curl/easy.h
> +%{_includedir}/tarantool/curl/mprintf.h
> +%{_includedir}/tarantool/curl/multi.h
> +%{_includedir}/tarantool/curl/stdcheaders.h
> +%{_includedir}/tarantool/curl/system.h
> +%{_includedir}/tarantool/curl/typecheck-gcc.h
> +%{_includedir}/tarantool/curl/urlapi.h

AFAIR, just %{_includedir}/tarantool/curl (without %dir) should work
well and should install the whole directory. It'll allow us to update
libcurl beyond 7.73.0 (see [1]) without a fear to forget to update those

[1]: https://github.com/curl/curl/commit/6ebe63fac23f38df911edc348e8ccc72280f9434

There is a risk to miss a problem with installing the headers (if cmake
does not install it because of some problem), however partial installing
looks even worse.

How about Debian based distributions? Nothing to change, the headers
will be installed?

More information about the Tarantool-patches mailing list