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 2/2] build: install libCURL headers Date: Fri, 9 Apr 2021 22:55:23 +0300 [thread overview] Message-ID: <E32D1434-C854-4960-906E-0D0A849772E1@tarantool.org> (raw) In-Reply-To: <20210330231402.ukhamua3lcamoa4l@tkn_work_nb> Hi! Thanks for the review. > On Mar 31, 2021, at 02:14, Alexander Turenko <alexander.turenko@tarantool.org> wrote: > > 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. Done. >> 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. Added. >> 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 > rules. diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index 92e693955..f8f6c124a 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -268,6 +268,7 @@ fi %{_includedir}/tarantool/luajit.h %{_includedir}/tarantool/lualib.h %{_includedir}/tarantool/module.h +%{_includedir}/tarantool/curl > [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? commit bec7a26a238dd1c03672d0f46ca082497a3027a0 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 feb56dfca..1196b65b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,6 +428,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 linked statically. # diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md new file mode 100755 index 000000000..86363adb3 --- /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-4559). diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index 92e693955..f8f6c124a 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -268,6 +268,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:56 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-19 13:45 [Tarantool-patches] [PATCH 0/2] Install curl headers and enable smtp Roman Khabibov via Tarantool-patches 2021-03-19 13:45 ` [Tarantool-patches] [PATCH 1/2] build: " Roman Khabibov via Tarantool-patches 2021-03-30 23:13 ` Alexander Turenko via Tarantool-patches 2021-04-09 19:55 ` Roman Khabibov via Tarantool-patches 2021-04-12 10:01 ` Leonid Vasiliev via Tarantool-patches 2021-03-19 13:45 ` [Tarantool-patches] [PATCH 2/2] build: install libCURL headers Roman Khabibov via Tarantool-patches 2021-03-30 23:14 ` Alexander Turenko via Tarantool-patches 2021-04-09 19:55 ` Roman Khabibov via Tarantool-patches [this message] 2021-04-12 13:14 ` Leonid Vasiliev via Tarantool-patches 2021-04-15 0:28 ` [Tarantool-patches] [PATCH 0/2] Install curl headers and enable smtp Alexander Turenko 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=E32D1434-C854-4960-906E-0D0A849772E1@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 2/2] 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