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 6C1F16C1AE; Wed, 19 May 2021 16:23:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6C1F16C1AE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1621430597; bh=hKJv/AQS3B2ZiynS3y5vvcI26vN34yuYP+ZH2J26cSg=; 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=m27h8X0Q72gskB+ERpJhm5jkezc1jc2pkeY9+1jGQYKz/yB/kqip2Z5kwDsZJXNmM JC6muRCNjwqYXF7Ddi1KkYXiVgPXIlBvG+U59Sy3UaXrcn1GiXqBVbBefbuXGFB3uY NLpCaBx1yhLL+ND+MCFar3bo7SRK9sanQamKFK5o= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 2E53C6C1AE for ; Wed, 19 May 2021 16:23:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2E53C6C1AE Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1ljMAN-0005Wr-1u; Wed, 19 May 2021 16:23:15 +0300 Date: Wed, 19 May 2021 16:23:13 +0300 To: Sergey Ostanevich Message-ID: <20210519132313.GT3944@tarantool.org> References: <4dd97d6fbfb470d41e9ef5ad12492a0def664b2b.1620678384.git.imun@tarantool.org> <20210512215532.GE3944@tarantool.org> <20210517172157.GO3944@tarantool.org> <20210518184728.GP3944@tarantool.org> <20210519113800.GQ3944@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD91B019B01C53E51AF07EDA974EE11B688BBB65244C6A6BC9F00894C459B0CD1B9CDB349CE0C3069EE816C04BAACD4FBD91BDC8804EF3F666C02FAF9720996C769 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E9A0F80F179600C6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637EF59B520676799BC8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2CF5F310E4A3ACF911077440F222D84EA3999716826408816D2E47CDBA5A96583C09775C1D3CA48CF17B107DEF921CE79117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE7328B01A8D746D8839FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA71A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89FB26E97DCB74E6252C6EABA9B74D0DA47B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A52AB698A20F1902277E4B4CA83F405CC3DFD9865BAF0EA59ED59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA752546FE575EB473F1410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34A533D6DF7731C664455645C357E810C5DDBFE8BABF01CEF27B05BF7117A2D730F4AECFD2512F24451D7E09C32AA3244CA098A11788EA9F47171C6E98A84777608A6D4CC6FBFAC251927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojF35yOkZDoIX+kRPth/DL/g== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822068F8CBA6E0286567104752FB9BF5F12A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 1/3] build: pass sysroot to MacOS SDK 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergos, Thanks for your review! On 19.05.21, Sergey Ostanevich wrote: > Hi! > > I believe we move from patch to two files originally > +++ b/CMakeLists.txt > +++ b/cmake/LuaJITUtils.cmake > > to just one, in 432cdf62303b0d609525acc84b01b92ae468d327 > +++ b/cmake/LuaJITUtils.cmake > > I expect to see a ‘v2’ in such a case - for the forthcoming patches. Ouch, my bad. There were so many iterative patches that even if all changes are in the same files, it's worth to send v2 series. > > Anyways, if I read the correct patch above from the imun/gh-5983-fix-build-on-m1 > branch then it’s LGTM with just a typo fix. Added your tag: | Reviewed-by: Sergey Ostanevich > > Sergos > > > > On 19 May 2021, at 14:38, Igor Munkin wrote: > > > > As a result of offline discussion with Sergey, I've finally understood > > the docs and fixed the issue. Diff is below: > > > > ================================================================================ > > > > diff --git a/cmake/LuaJITUtils.cmake b/cmake/LuaJITUtils.cmake > > index 3497edc4..29c425de 100644 > > --- a/cmake/LuaJITUtils.cmake > > +++ b/cmake/LuaJITUtils.cmake > > @@ -4,7 +4,12 @@ function(LuaJITTestArch outvar strflags) > > # machinery) or explicitly (manually by configuration options). > > # Need -isysroot flag on recentish MacOS after command line > > # tools no longer provide headers in /usr/include. > > - if(CMAKE_OSX_SYSROOT) > > + # XXX: According to CMake documentation[1], CMAKE_OSX_SYSROOT > > + # variable *should* be ignored on the plaforms other than MacOS. > platforms Fixed, thanks! > > + # It is ignored by CMake, but since this routine is extension > > + # it also should follow this policy. > > + # [1]: https://cmake.org/cmake/help/v3.1/variable/CMAKE_OSX_SYSROOT.html > > + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) > > set(strflags "${strflags} -isysroot ${CMAKE_OSX_SYSROOT}") > > endif() > > # XXX: simply splits the COMMAND argument by > > > > ================================================================================ > > > > > > -- > > Best regards, > > IM > -- Best regards, IM