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 DF4E26EC60; Wed, 31 Mar 2021 02:14:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DF4E26EC60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617146045; bh=jHBbBsn5/gxNnoVKI1NYsweJV+whIzYnoGDXAFliqv4=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=UC9L3VC53wheSoP8tqNV4jKewBIvzSDrI/hfnu9JgnG5fbtI7/yeeI0WffdtjHBxS 5Fa8ArogOhjNxFb/insTf6QpXhuVoWTb+SEA14fhnUEMduJ15352V+fM4Rhn1m6Qq0 y2ExWTPis6ysVc8vgHZZIl/iYxaWfgwwVbAnyhiU= Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [94.100.177.107]) (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 6F3F66EC60 for ; Wed, 31 Mar 2021 02:13:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6F3F66EC60 Received: by smtp47.i.mail.ru with esmtpa (envelope-from ) id 1lRNYK-0007Lc-RK; Wed, 31 Mar 2021 02:13:41 +0300 Date: Wed, 31 Mar 2021 02:14:02 +0300 To: Roman Khabibov Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210330231402.ukhamua3lcamoa4l@tkn_work_nb> References: <20210319134555.71396-1-roman.habibov@tarantool.org> <20210319134555.71396-3-roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210319134555.71396-3-roman.habibov@tarantool.org> X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9ED7173E37F4E32947A0146560F8BA70927CAA5B950F38D9F182A05F53808504065002167498BE7C192E5B89DEBEC668E3ED62D81CDAFAAE7B76A464BCD3AF26A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE721AF84DC1D70954DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F63E14183F8C6AF98638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95CE99938B3FD79E1DF028C7E7BFACA77BCBBEB9C5CEC31F9C7A471835C12D1D9774AD6D5ED66289B5278DA827A17800CE7820CF4CC0E318EFB9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C390D92131081DE748117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CF075F9A7D04919DF9BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B6C8DB98A3EA1214A176E601842F6C81A1F004C906525384307823802FF610243DF43C7A68FF6260569E8FC8737B5C2249B372FE9A2E580EFC725E5C173C3A84C37A059B4337C5CCEC75ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824AC8B6CDF511875BC4E8F7B195E1C978317354B61A791D4237D5EE6400B98F466E X-C1DE0DAB: 0D63561A33F958A501B5FA958F39127E8A1BD76524DEA802F8DD3ECFEDB37B94D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3475FE4AA98865E235AF8021AEA4B2DF6F9E4F3E868F4BF9CEEE4EFA70232AFCC45AE92875C7D250B71D7E09C32AA3244C528596F3635493D87D9F4B73EA9674D855E75C8D0ED9F6EE729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojfQIxm2xDGoYtcykPIbYa6Q== X-Mailru-Sender: FFAA8E4AEE17E37C3731A083A1A85ADE927CFA6AEC163C7D0FD4317662938C9EB7EA9FE7735C3DBFC664A44C781FCEA7C77752E0C033A69EDF9F2CE1E9CF805D8CD356D4F938FF726C18EFA0BB12DBB0 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: Alexander Turenko via Tarantool-patches Reply-To: Alexander Turenko Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 rules. [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?