From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id B315A6EC5B; Mon, 12 Apr 2021 16:16:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B315A6EC5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618233387; bh=ZKScFn4pizvQam5qbcS/BIcfTV5WYc04GdCdfrp9BG4=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=YAXTuA8CZLiHpCiqvBzr4xWAX7Sokpomxsa2MM+Ji5IW4nlQbL5Md6FuBGH7S4eLF yBAv3NC1AdncI405azTwW4e+co0AK48W4DtwoEVBekZWuNdxxlZB8FrHqENjA0DP4S Oks7yR5/P3f53jXBbQSzsWJ9K3A6EShOapDNioi8= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (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 D0B8A6EC5B for ; Mon, 12 Apr 2021 16:16:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D0B8A6EC5B Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1lVwQT-00082d-0j; Mon, 12 Apr 2021 16:16:25 +0300 To: Roman Khabibov , Alexander Turenko Cc: tarantool-patches@dev.tarantool.org References: <20210319134555.71396-1-roman.habibov@tarantool.org> <20210319134555.71396-3-roman.habibov@tarantool.org> <20210330231402.ukhamua3lcamoa4l@tkn_work_nb> Message-ID: Date: Mon, 12 Apr 2021 16:14:52 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480BE79914FF86F9151AC38CC435EA4A654182A05F538085040E478CF5EF56018DD5045308D183F1DA08BA16E36A9C27A17F9B0326C377EBDA1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75AD53DF1D86BACA3EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637DD81BB19E5DE3F6B8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B27670B5B6F14B66DA7E17FFFE26D77AF7C7C2BEF539CC105AD2E47CDBA5A96583C09775C1D3CA48CF7EF884183F8E4D67117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE70F3DDF2BBF19B93A9FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE79C0DA0AD91AF617E7B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050FB28585415E75ADA9CEDA8D6C8C3B0531B3661434B16C20AC78D18283394535A9E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24209795067102C07E8F7B195E1C978318DFDF122D798890E7E6ED54993E2D80B X-C1DE0DAB: 0D63561A33F958A5F4176FA61D0B91F0E77820E13C628754C1D4A65407C94FD5D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348BE83DFD8AFB1CAC56F22830F3E41C09817E3B23A13F411501F45AAE147B402DAFBEF6BAFF62EDB71D7E09C32AA3244CD2FFF52D121B5F2CA3D6C8C3F2564B9C1E098CBE561D6343FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojq8JA+pXcDumUlNxzdzudrw== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769B83622338E72536E5045308D183F1DA07AD558DE3329E344D35D514C7DAC97282D063C67CFD4E84987597EC79699C0E6F21BD4036121A32F7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH 2/2] build: install libCURL headers X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Leonid Vasiliev via Tarantool-patches Reply-To: Leonid Vasiliev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thank you for the patch. Have you check that patch works fine on all distributions? If yes - LGTM On 4/9/21 10:55 PM, Roman Khabibov wrote: > Hi! Thanks for the review. > >> On Mar 31, 2021, at 02:14, Alexander Turenko 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 > 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 1.7.5.46-1 > >