From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Ostanevich <sergos@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit 1/3] build: pass sysroot to MacOS SDK Date: Wed, 19 May 2021 16:23:13 +0300 [thread overview] Message-ID: <20210519132313.GT3944@tarantool.org> (raw) In-Reply-To: <EB8C1616-7A24-423F-B09F-0F649F031C81@tarantool.org> 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@tarantool.org> > > Sergos > > > > On 19 May 2021, at 14:38, Igor Munkin <imun@tarantool.org> 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 <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: <execute_process> simply splits the COMMAND argument by > > > > ================================================================================ > > <snipped> > > > > -- > > Best regards, > > IM > -- Best regards, IM
next prev parent reply other threads:[~2021-05-19 13:23 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-10 22:09 [Tarantool-patches] [PATCH luajit 0/3] Basic fixes for LuaJIT on ARM64 Macs Igor Munkin via Tarantool-patches 2021-05-10 22:09 ` [Tarantool-patches] [PATCH luajit 1/3] build: pass sysroot to MacOS SDK Igor Munkin via Tarantool-patches 2021-05-11 9:49 ` Sergey Kaplun via Tarantool-patches 2021-05-12 21:55 ` Igor Munkin via Tarantool-patches 2021-05-14 16:07 ` Sergey Kaplun via Tarantool-patches 2021-05-17 17:21 ` Igor Munkin via Tarantool-patches 2021-05-18 5:50 ` Sergey Kaplun via Tarantool-patches 2021-05-18 18:47 ` Igor Munkin via Tarantool-patches 2021-05-19 11:38 ` Igor Munkin via Tarantool-patches 2021-05-19 12:40 ` Sergey Ostanevich via Tarantool-patches 2021-05-19 13:23 ` Igor Munkin via Tarantool-patches [this message] 2021-05-19 16:06 ` Sergey Kaplun via Tarantool-patches 2021-05-10 22:09 ` [Tarantool-patches] [PATCH luajit 2/3] OSX/iOS: Handle iOS simulator and ARM64 Macs Igor Munkin via Tarantool-patches 2021-05-11 11:02 ` Sergey Kaplun via Tarantool-patches 2021-05-11 11:03 ` Igor Munkin via Tarantool-patches 2021-05-14 11:36 ` Sergey Ostanevich via Tarantool-patches 2021-05-14 11:27 ` Igor Munkin via Tarantool-patches 2021-05-10 22:09 ` [Tarantool-patches] [PATCH luajit 3/3] FFI/ARM64/OSX: Fix vararg call handling Igor Munkin via Tarantool-patches 2021-05-11 11:07 ` Sergey Kaplun via Tarantool-patches 2021-05-11 11:31 ` Igor Munkin via Tarantool-patches 2021-05-12 16:11 ` Sergey Ostanevich via Tarantool-patches 2021-05-12 21:59 ` Igor Munkin via Tarantool-patches 2021-05-13 9:50 ` Sergey Ostanevich via Tarantool-patches 2021-05-13 10:44 ` Igor Munkin via Tarantool-patches 2021-05-14 10:10 ` Sergey Ostanevich via Tarantool-patches 2021-05-14 10:31 ` Igor Munkin via Tarantool-patches 2021-05-19 15:38 ` [Tarantool-patches] [PATCH luajit 0/3] Basic fixes for LuaJIT on ARM64 Macs Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210519132313.GT3944@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=sergos@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 1/3] build: pass sysroot to MacOS SDK' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox