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 4D8BE6EC5D; Fri, 9 Apr 2021 22:56:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4D8BE6EC5D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617998201; bh=j6H6/3ifgkdvCEc3s6rD6KwSl3AH1W5k77DQ/sBbHKM=; h=In-Reply-To:Date:Cc:References:To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=u/L27eX/f1gjBp0nK+A66hI6g45M9K5DUijniZoEaTWHkNw7rQrujp10abHcYAFco Dd09WdF04Ujn//jaEMiRW///K8LydyIsn2f99we28yrmIwstyh7kBBpla8fOsMHabw p/y34oTFmflzM17GhSLdqWVHv4HoH+bubgaYc5lw= Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [94.100.177.104]) (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 CAEA86EC5E for ; Fri, 9 Apr 2021 22:55:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CAEA86EC5E Received: by smtp44.i.mail.ru with esmtpa (envelope-from ) id 1lUxDw-0006AJ-2y; Fri, 09 Apr 2021 22:55:24 +0300 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) In-Reply-To: <20210330231402.ukhamua3lcamoa4l@tkn_work_nb> Date: Fri, 9 Apr 2021 22:55:23 +0300 Cc: tarantool-patches@dev.tarantool.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <20210319134555.71396-1-roman.habibov@tarantool.org> <20210319134555.71396-3-roman.habibov@tarantool.org> <20210330231402.ukhamua3lcamoa4l@tkn_work_nb> To: Alexander Turenko , Leonid Vasiliev X-Mailer: Apple Mail (2.3608.120.23.2.1) X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480EBD5CA77A668ECB87DA2124B0A8E6609182A05F538085040E94734AC7937BD2CE88BE19B8A8D4E224E5FECFB8C2892AA79A144BBC9420A82 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE741DC22BF90A736D8EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637CD8995A08F41566CEA1F7E6F0F101C67CDEEF6D7F21E0D1D9295C2E9FA3191EE1B59CA4C82EFA6588826A5D6850FD4FFA3FFCB5CBDE79CF3F6B57BC7E64490618DEB871D839B73339E8FC8737B5C224952D31B9D28593E51CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C0A29E2F051442AF778941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD26923F8577A6DFFEA7CDEF01B32A5E68B137B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050F0A3850AC1BE2E7352AE38A8E97BAFFB1B3661434B16C20ACED10789A92E36F76E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B69F828182E212B6AD089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824A2A04A2ABAA09D25379311020FFC8D4ADED27546C620ED1490CA77E1C27A6444E X-C1DE0DAB: 0D63561A33F958A5306C5CBD9931A66C335B3E6AA92A667365AB759FEADBB450D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349A401E2B4D763A4AE9D74EDB696E838E5C98319677AE02581892AC62E8EC762DADDE5EAEB0AE27C41D7E09C32AA3244C6D61A31D2B7DB8FB3F9EC180FE70C15BD08D48398F32B4A6FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyO2lHpuZu4T0srRhJ7uUig== X-Mailru-Sender: ED747E36EB90C325A4602F7CA2CC58C12BA969D8753FEFDBC2AA785AD1EDEA4B3FB1763410276AF21EC3B765AEBF8DFDC77752E0C033A69EF2501F26BCC01020D1D7FFF4A7B59B3C6C18EFA0BB12DBB0 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: Roman Khabibov via Tarantool-patches Reply-To: Roman Khabibov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the review. > On Mar 31, 2021, at 02:14, Alexander Turenko = wrote: >=20 > LGTM after fixes (no need to re-review with me). >=20 > Please, update and proceed with the next reviewer. >=20 > 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. >=20 > Please, reflect comments to the first patch here: the library naming, > motivation of the change, the issue number. >=20 > 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 >=20 > 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 >=20 > 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/6ebe63fac23f38df911edc348e8ccc72280f94= 34 >=20 > 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. >=20 > 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 =20 Ship libcurl headers to system path "${PREFIX}/include/tarantool" in the case of libcurl included as bundled library. =20 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() =20 +# 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 =20 %changelog * Tue Sep 12 2017 Roman Tsisyk 1.7.5.46-1