From: Roman Khabibov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org>, Leonid Vasiliev <lvasiliev@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 3/3] build: install libCURL headers Date: Fri, 9 Apr 2021 22:54:58 +0300 [thread overview] Message-ID: <3D01FC5C-36FE-4B8F-A02C-C402EC85A523@tarantool.org> (raw) In-Reply-To: <20210401001052.hu2thcgcfj2xlemi@tkn_work_nb> > On Apr 1, 2021, at 03:10, Alexander Turenko <alexander.turenko@tarantool.org> wrote: > > On Fri, Mar 19, 2021 at 05:13:08PM +0300, Roman Khabibov wrote: >> Ship libCURL headers to system path "include/tarantool" in the >> case of libCURL included as bundled library. >> --- > > Is it quite straigtforward backport of [1], so it is okay too after the > proposed fixes [2]. > > Only one note for the backport: it seems, a changelog entry was > forgotten here. > > [1]: https://lists.tarantool.org/pipermail/tarantool-patches/2021-March/022798.html > [2]: https://lists.tarantool.org/pipermail/tarantool-patches/2021-March/023178.html > > WBR, Alexander Turenko. commit 3fd88650bd4bbe6d0bbbfa5fbedd38dc5d9f1578 Author: Roman Khabibov <roman.habibov@tarantool.org> Date: Sun Dec 20 13:08:40 2020 +0500 build: install libcurl headers Ship libcurl headers to system path "${PREFIX}/include/tarantool" in the case of libcurl included as bundled library. Closes #4559 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e2ddb503..263d455fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,6 +347,13 @@ else() find_package(CURL) endif() +# Install headers. +if (ENABLE_BUNDLED_LIBCURL) + install(DIRECTORY "${CURL_INCLUDE_DIRS}/curl" + DESTINATION ${MODULE_FULL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") +endif() + # # Export libcurl symbols if the library is bundled. # diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index cbc97606b..fa521e47b 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -251,6 +251,7 @@ fi %{_includedir}/tarantool/luajit.h %{_includedir}/tarantool/lualib.h %{_includedir}/tarantool/module.h +%{_includedir}/tarantool/curl %changelog * Tue Sep 12 2017 Roman Tsisyk <roman@tarantool.org> 1.7.5.46-1
next prev parent reply other threads:[~2021-04-09 19:55 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-19 14:13 [Tarantool-patches] [PATCH 0/3] Export curl symbols, enable smtp and install headers Roman Khabibov via Tarantool-patches 2021-03-19 14:13 ` [Tarantool-patches] [PATCH 1/3] build: export libCURL symbols Roman Khabibov via Tarantool-patches 2021-03-31 23:56 ` Alexander Turenko via Tarantool-patches 2021-04-09 19:54 ` Roman Khabibov via Tarantool-patches 2021-04-01 0:01 ` Alexander Turenko via Tarantool-patches 2021-03-19 14:13 ` [Tarantool-patches] [PATCH 2/3] build: enable smtp in libCURL Roman Khabibov via Tarantool-patches 2021-04-01 0:52 ` Alexander Turenko via Tarantool-patches 2021-04-09 19:54 ` Roman Khabibov via Tarantool-patches 2021-03-19 14:13 ` [Tarantool-patches] [PATCH 3/3] build: install libCURL headers Roman Khabibov via Tarantool-patches 2021-04-01 0:10 ` Alexander Turenko via Tarantool-patches 2021-04-09 19:54 ` Roman Khabibov via Tarantool-patches [this message] 2021-04-13 13:14 ` [Tarantool-patches] [PATCH 0/3] Export curl symbols, enable smtp and install headers Leonid Vasiliev via Tarantool-patches 2021-04-14 17:52 ` Roman Khabibov via Tarantool-patches
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=3D01FC5C-36FE-4B8F-A02C-C402EC85A523@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=lvasiliev@tarantool.org \ --cc=roman.habibov@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 3/3] build: install libCURL headers' \ /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