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 62A196EC5F; Thu, 15 Apr 2021 03:27:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 62A196EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618446475; bh=7xFNHBmGojsDv3RKVIfU6am02Of9GrlO02nTR1J3EYg=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=lfijGh5AmqSXNWm/jH0wQnvOv1S0N1WNbtLVkjJit4e+DzLP397hG9MOnu2JYZtLW hl7AVXlSm1vhF14MIT8zmreR12+aTx6M9RvXe0niav1cwUnh/sswpSwo5mwP2dOzC2 rBPl9nSCT0QwOAcqLyddBSbnYitE5u651gF4ZOBc= Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (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 CF4686EC5F for ; Thu, 15 Apr 2021 03:27:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CF4686EC5F Received: by smtp49.i.mail.ru with esmtpa (envelope-from ) id 1lWprN-00088K-RG; Thu, 15 Apr 2021 03:27:54 +0300 Date: Thu, 15 Apr 2021 03:28:15 +0300 To: Roman Khabibov Message-ID: <20210415002815.lt4m75l226ubeaes@tkn_work_nb> References: <20210319134555.71396-1-roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210319134555.71396-1-roman.habibov@tarantool.org> X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480B1C8842CE613979723F2FB4628545A35182A05F5380850406AD3D12635E1E0299B26AC91D1F1B28A991C54B33D0EDE6556BAA5DB0DA090B5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE76C0A440987CA342DC2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE7A179494B5629353BEA1F7E6F0F101C67CDEEF6D7F21E0D1D9295C2E9FA3191EE1B59CA4C82EFA6586ADE6A1DED64F2F6BAAE0A86C018A003F6B57BC7E64490618DEB871D839B73339E8FC8737B5C2249957A4DEDD2346B42CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92176DF2183F8FC7C0A3E989B1926288338941B15DA834481F9449624AB7ADAF37BA3038C0950A5D3613377AFFFEAFD26923F8577A6DFFEA7C2CE3587E4385123B7B076A6E789B0E97A8DF7F3B2552694A1E7802607F20496D49FD398EE364050F9647ADFADE5905B14782AAF36435267CB3661434B16C20AC78D18283394535A9E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B69C803D8CAE72B18A089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2368A440D3B0F6089093C9A16E5BC824A2A04A2ABAA09D25379311020FFC8D4AD48C8163CD7E2ABE7CD1E3916F3199891 X-C1DE0DAB: 0D63561A33F958A507C856050EF4CEC6AEA38C3ED10D9FB2C279BFCB246D2148D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349F4E6BC39AAD02BBFE07C785F2A8243978DBFCDC10FC9AF6A252E6A608E1DE45564C11C62ED992601D7E09C32AA3244CC4E7D3ED6580C2D513ECE6B8C2A49D6D30363D8B7DA7DD44FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojrcJA+pXcDulK/vHe49IrMQ== X-Mailru-Sender: FFAA8E4AEE17E37C3731A083A1A85ADECA9B4FB3A07CD24C749E4308F037D495B7EA9FE7735C3DBFC664A44C781FCEA7C77752E0C033A69EDF9F2CE1E9CF805D8CD356D4F938FF726C18EFA0BB12DBB0 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH 0/2] Install curl headers and enable smtp 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 Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" On Fri, Mar 19, 2021 at 04:45:53PM +0300, Roman Khabibov wrote: > The patchset is only for 2.8. > > Issue: https://github.com/tarantool/smtp/issues/24 > Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/curl-smtp > > Roman Khabibov (2): > build: enable smtp > build: install libCURL headers Rebased on actual master and 1.10 and verified in CI for regressions. Pushed to master, 2.7, 2.6, 1.10. WBR, Alexander Turenko. ---- My fixups: 1. Markdown formatting. diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md index 86363adb3..003c7566e 100755 --- a/changelogs/unreleased/install-headers.md +++ b/changelogs/unreleased/install-headers.md @@ -1,4 +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). + case of libcurl included as bundled library or static build (gh-4559). 2. Clafiried the include directory path in the changelog entry. diff --git a/changelogs/unreleased/install-headers.md b/changelogs/unreleased/install-headers.md index 003c7566e..957574c05 100755 --- a/changelogs/unreleased/install-headers.md +++ b/changelogs/unreleased/install-headers.md @@ -1,4 +1,4 @@ ## feature/build -* Ship libcurl headers to system path "include/tarantool" in the +* Ship libcurl headers to system path "${PREFIX}/include/tarantool" in the case of libcurl included as bundled library or static build (gh-4559). ---- On 1.10: 3. Linked the relevant issues in the changelog entry. diff --git a/changelogs/unreleased/export-curl-symbols.md b/changelogs/unreleased/export-curl-symbols.md index 3a8213b1c..ac07ccab9 100644 --- a/changelogs/unreleased/export-curl-symbols.md +++ b/changelogs/unreleased/export-curl-symbols.md @@ -1,3 +1,4 @@ ## feature/build -* libcurl symbols in the case of bundled libcurl are now exported (gh-####). +* libcurl symbols in the case of bundled libcurl are now exported (gh-5223, + gh-5542). 4. The similar change for the commit message. -This patch is just 1.10 adaptation of two original commits 29ec628 -47c19ee. +This patch is just 1.10 adaptation of two original commits: + +* 29ec628918bd7279de08e47becc070420775c2eb ('Ensure all curl symbols are + exported') +* 47c19eeb4f67cb7257ce32542443c09410b6e752 ('build: don't re-export + libcurl.so/dylib symbols') + +Fixes #5223 +Fixes #5542 4. Removed a period from the URL. -See related issue: https://github.com/tarantool/smtp/issues/24. +See related issue: https://github.com/tarantool/smtp/issues/24 5. Added the comment from master's patch. diff --git a/test/box-tap/curl-build.test.lua b/test/box-tap/curl-build.test.lua index 640d5d143..ae0d397b5 100755 --- a/test/box-tap/curl-build.test.lua +++ b/test/box-tap/curl-build.test.lua @@ -78,6 +78,9 @@ else RTLD_DEFAULT = ffi.cast("void *", 0LL) end +-- +-- gh-5223: Check if all curl symbols are exported. +-- -- The following list was obtained by parsing libcurl.a static library: -- nm libcurl.a | grep -oP 'T \K(curl_.+)$' | sort local curl_symbols = { 6. Adjusted a comment to master's wording. diff --git a/CMakeLists.txt b/CMakeLists.txt index 26807c678..80337ffa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,7 +358,7 @@ if (ENABLE_BUNDLED_LIBCURL) endif() # -# Export libcurl symbols if the library is bundled. +# Export libcurl symbols if the library is linked statically. # if (ENABLE_BUNDLED_LIBCURL) set(EXPORT_LIBCURL_SYMBOLS ON) 7. Mentioned actual commit hashes in backports. +(backported from commit 4bde1dbc0fddbff04889f4a483dd97083435dd3a) +(backported from commit 38d0b0c1f62886f40db1279da64f2fac75473119)