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 242B76C1AE; Fri, 14 May 2021 19:08:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 242B76C1AE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1621008493; bh=7oRDkMS6S/BjjmlFUCKW7ZMRiqN5QMGuKL+Wos62In4=; 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=jBAkgK3mibfDK4CG0e6gYpxCOGz/VBynwOWR5n9J57OQ10zS5p0BgFXSqX7/ltlfK lv9Hb6aA3QBWFqk8pmBY0F845/5GklRvhc+1x/C6iomsIpMy+ppHF4MXX9qiOX3s79 GfBXVcGmmyjfa1walslbcvTf2Q1Ym3MrrPq7881A= Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37]) (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 EEF626C1AE for ; Fri, 14 May 2021 19:08:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EEF626C1AE Received: by smtp57.i.mail.ru with esmtpa (envelope-from ) id 1lhaME-0002IV-TD; Fri, 14 May 2021 19:08:11 +0300 Date: Fri, 14 May 2021 19:07:05 +0300 To: Igor Munkin Message-ID: References: <4dd97d6fbfb470d41e9ef5ad12492a0def664b2b.1620678384.git.imun@tarantool.org> <20210512215532.GE3944@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210512215532.GE3944@tarantool.org> X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD95978C26455E69BE022900C3053DBED76BEB47C8A8E1FDA50182A05F53808504081B44C4428D94A35DDF38DE7E83A0307141828601451BD3D9151F9AFA3D8C82D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7364F8074C6DFACE2C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE74323F140F3EE5B6A8F08D7030A58E5AD1A62830130A00468AEEEE3FBA3A834EE7353EFBB55337566351AA76E933652BC0F994232DE73A8A2469B00C4398E408BA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE767883B903EA3BAEA9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C37EF884183F8E4D67117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637A7EFCB0EB5ACB161EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C9783181A70AAD94FC7C2CBE75460A6CDB2857 X-C1DE0DAB: 0D63561A33F958A50A643B50CBCC6931EE3F17A697A52C997C99CC552F6606BFD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75438CC92D4039F4E2410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346F44602F3B494634B39D9DB57DE5479267605FC26D1C0C48C741BA1E42FB0A1D8F176824E875FF201D7E09C32AA3244C0CCD4971A36B2B34B59DFBE0D08AA537725D5B54B2FE4575FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojpk2Lq/ZT761E7SGt7R+K5g== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB422F1818A08CFA1C1C52D7101E8F11E2D439F642D4C6A9411F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 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: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Igor, Thanks for the fixes! Please fix the nit below. Otherwise, LGTM. On 13.05.21, Igor Munkin wrote: > Sergey, > > Thanks for such precise review! I've answered the questions below and > re-implemented the fix (the new patch is at the end), so hold your LGTM > for a while. > > On 11.05.21, Sergey Kaplun wrote: > > Side note: Also I've seen that Mike uses OSX_DEPLOYMENT_TARGET variable. > > Moreover, CMAKE_OSX_SYSROOT should "computed based on the > > CMAKE_OSX_DEPLOYMENT_TARGET or the host platform" according to [4]. > > And by itself, it means the minimum possible IOS version, where an > > application may run [5]. May be we should fix this too with a separate > > issue and patch (to protect users from building LuaJIT on ancient > > devices)? > > Sorry, I don't get this one. What exactly is bothering you here? Just friendly reminder. It's not related to the patch. Just a side note. :) I remembered about it only because it is part of OSX twists. There is no need to do it in this patch, but maybe later? > > > > +) > > > + AppendFlags(CMAKE_C_FLAGS "${CMAKE_C_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT}") > > > +endif() > > > > Also, as far as this misbehaviour is occuring only for LuaJITTestArch() > > macro we may avoid tweaking of global CMAKE_C_FLAGS, but just append it > > to TESTARCH_C_FLAGS if it is necessary. > > Unfortunately, CMake is a crap. At first, these flags are required at > the configuration phase, but everything works fine at the build phase. > As a result of investigation, I've found that CMake emits[1] these flags > (both -arch and -isysroot) to a separate flags.make file located deep > into CMakeFiles/ directory. Moreover, they are not available via CMake > variables (used at configuration phase). They are just -ed to > the freaking file being included in build.make. Nice work, dudes! If > they wanted the most foolproof solution, they made it! > > However, thanks to CMake authors for their tests: I've taken the recipe > there[2], so you can consider this as "Официальная позиция CMake". > Again, the changes are below. Thanks for the investigation and clarification! > > > > > [1]: https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html > > [2]: https://cmake.org/cmake/help/v3.1/manual/cmake-variables.7.html > > [3]: https://github.com/LuaJIT/LuaJIT/blob/8dc3cd6c84dfc81539604340b7884408e1c71d55/doc/install.html#L437 > > [4]: https://cmake.org/cmake/help/v3.1/variable/CMAKE_OSX_SYSROOT.html > > [5]: https://developer.apple.com/library/archive/documentation/ToolsLanguages/Conceptual/Xcode_Overview/WorkingwithTargets.html > > > > -- > > Best regards, > > Sergey Kaplun > > ================================================================================ > > build: pass sysroot to MacOS SDK > > There were issues with configuring LuaJIT on Apple machines, since > CMake auxiliary routine fails to locate system headers > (e.g. assert.h in case when LUA_USE_ASSERT is enabled). As a result > platform detection fails and LuaJIT configuration ends with the fatal > error. This patch adds the necessary flags to help the routine to find > the required system headers. > > Needed for tarantool/tarantool#6065 > Relates to tarantool/tarantool#5629 > Follows up tarantool/tarantool#4862 What's about 5983? Shouldn't it be mentioned too? > > Signed-off-by: Igor Munkin > --- > cmake/LuaJITUtils.cmake | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/cmake/LuaJITUtils.cmake b/cmake/LuaJITUtils.cmake > index d9f8b12a..3497edc4 100644 > --- a/cmake/LuaJITUtils.cmake > +++ b/cmake/LuaJITUtils.cmake > @@ -1,4 +1,12 @@ > function(LuaJITTestArch outvar strflags) > + # XXX: This routine uses external headers (e.g. system ones), > + # which location is specified either implicitly (within CMake > + # 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) Nit: This variable should be taken into account only for OS X platforms [1]. I suppose not only by CMake, but by our build system too. I've got the error on Linux if I try to build LuaJIT like the following (by mistake of course): | $ uname -s | Linux | $ cmake . -DCMAKE_OSX_SYSROOT="/tmp/blablabalblablbalalbla" -DLUA_USE_ASSERT=ON -DCMAKE_BUILD_TYPE=Debug | In file included from lua.h:14, | from lj_arch.h:9: | /usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include/stdint.h:9:16: fatal error: stdint.h: No such file or directory | 9 | # include_next | | ^~~~~~~~~~ | compilation terminated. | CMake Error at cmake/LuaJITUtils.cmake:48 (message): | [LuaJITArch] Unsupported target architecture | Call Stack (most recent call first): | cmake/SetTargetFlags.cmake:16 (LuaJITArch) | src/CMakeLists.txt:17 (include) > + set(strflags "${strflags} -isysroot ${CMAKE_OSX_SYSROOT}") > + endif() > # XXX: simply splits the COMMAND argument by > # spaces with no further parsing. At the same time GCC is bad in > # argument handling, so let's help it a bit. > > ================================================================================ > > [1]: https://gitlab.kitware.com/cmake/cmake/-/blob/master/Source/cmLocalGenerator.cxx#L1911-1916 > [2]: https://gitlab.kitware.com/cmake/cmake/-/blob/master/Tests/FindPackageModeMakefileTest/CMakeLists.txt#L24-28 > > > -- > Best regards, > IM [1]: https://cmake.org/cmake/help/v3.0/variable/CMAKE_OSX_SYSROOT.html -- Best regards, Sergey Kaplun