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 C18256EC5D; Fri, 9 Apr 2021 22:55:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C18256EC5D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617998140; bh=5y6KHuV7aZoPLJ8UpX38oxoqoAL35rWOLSRRvpjrSW8=; 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=JZQ0K3E0cv5wMN7GHV6ub1LFFC28CLzp1+ZmUX0TSL/nMg+ovO6/oIYGJbkLcRZfj BiCBw/1759qRI6YUXIXHp5QgQHsaNulrOC7MPtr0MospZw0W4ocZWJSp4cigbEj1KM C6g8yUDXyHPKHTEAbm4Eetp3vYwGY1ssDVUwYJeg= 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 BFF806EC5D for ; Fri, 9 Apr 2021 22:54:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BFF806EC5D Received: by smtp44.i.mail.ru with esmtpa (envelope-from ) id 1lUxDX-0006AJ-2T; Fri, 09 Apr 2021 22:54:59 +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: <20210401001052.hu2thcgcfj2xlemi@tkn_work_nb> Date: Fri, 9 Apr 2021 22:54:58 +0300 Cc: tarantool-patches@dev.tarantool.org Content-Transfer-Encoding: quoted-printable Message-Id: <3D01FC5C-36FE-4B8F-A02C-C402EC85A523@tarantool.org> References: <20210319141308.98726-1-roman.habibov@tarantool.org> <20210319141308.98726-4-roman.habibov@tarantool.org> <20210401001052.hu2thcgcfj2xlemi@tkn_work_nb> To: Alexander Turenko , Leonid Vasiliev X-Mailer: Apple Mail (2.3608.120.23.2.1) X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480D608FE24BC85426BB1B55F651FED8C70182A05F5380850405554291314CBB160E88BE19B8A8D4E22957229D26FEF66308C7AF302B842C5F1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77E216A0E97507353EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006376AFB9B40001E44068638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B29471B69EC314F9E5A9569801BD2852A50FE69BD46C3DD557D2E47CDBA5A96583C09775C1D3CA48CFCA5A41EBD8A3A0199FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3ED8438A78DFE0A9E117882F4460429728AD0CFFFB425014E868A13BD56FB6657D81D268191BDAD3DC09775C1D3CA48CFA57222E48BFAED24BA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B62BE79A1C4A15D32B76E601842F6C81A1F004C906525384307823802FF610243D2EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7E2D6E337F4C08E1F731C566533BA786AA5CC5B56E945C8DA X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24209795067102C07E8F7B195E1C9783155679F835DC975BF86445F3BB20A73D6 X-C1DE0DAB: 0D63561A33F958A5D3C49014A65A1295335B3E6AA92A6673BC49FB04F35AF08FD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D344EF254DC71474AA3F93C937CA62401C1BC9AC963B80DE0E337F7087B8731169E69777F446991E6C71D7E09C32AA3244C79CCB2BCC0B931583F9EC180FE70C15BF165894D92D62706FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyO2lHpuZu4TpU0wQLWUhAQ== X-Mailru-Sender: ED747E36EB90C325A4602F7CA2CC58C14D04F6F28E5A1EC84387AE567667D47A3FB1763410276AF21EC3B765AEBF8DFDC77752E0C033A69EF2501F26BCC01020D1D7FFF4A7B59B3C6C18EFA0BB12DBB0 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH 3/3] 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" > On Apr 1, 2021, at 03:10, Alexander Turenko = wrote: >=20 > 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. >> --- >=20 > Is it quite straigtforward backport of [1], so it is okay too after = the > proposed fixes [2]. >=20 > Only one note for the backport: it seems, a changelog entry was > forgotten here. >=20 > [1]: = https://lists.tarantool.org/pipermail/tarantool-patches/2021-March/022798.= html > [2]: = https://lists.tarantool.org/pipermail/tarantool-patches/2021-March/023178.= html >=20 > WBR, Alexander Turenko. commit 3fd88650bd4bbe6d0bbbfa5fbedd38dc5d9f1578 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 7e2ddb503..263d455fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,6 +347,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 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 =20 %changelog * Tue Sep 12 2017 Roman Tsisyk 1.7.5.46-1