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 E127D7036F; Tue, 6 Dec 2022 00:51:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E127D7036F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1670277101; bh=5kCIIXtE4sbtEiUSYA7NTPna4xhPlUfAh2QwtwpljZc=; h=In-Reply-To:Date:References:To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=htpg7dF3+AYX5RR97gstAsBarPEgf9pLIrWkooBhU0tpH4aM8I+QPaxxGfeMToXiL Fh9V78HuM3Vj4gOvbq0YGa8xiRqi5iHQvGkZraOXkbEKDGfnLjVplb9nL3h+KorTtm 1poCSZqSGP62Gu8h7JqfTuJ9Ejr9nRGoX+QDefZw= Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110]) (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 3E9547036F for ; Tue, 6 Dec 2022 00:51:39 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3E9547036F Received: by smtp50.i.mail.ru with esmtpa (envelope-from ) id 1p2JNC-00017X-Ey; Tue, 06 Dec 2022 00:51:38 +0300 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.200.110.1.12\)) In-Reply-To: <20221028092638.11506-8-max.kokryashkin@gmail.com> Date: Tue, 6 Dec 2022 00:51:27 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: <0D258347-DEC5-4B1F-8A79-05AAF70D8F43@tarantool.org> References: <20221028092638.11506-1-max.kokryashkin@gmail.com> <20221028092638.11506-8-max.kokryashkin@gmail.com> To: Maksim Kokryashkin X-Mailer: Apple Mail (2.3731.200.110.1.12) X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD908190A22B884CF14F728BD2D4F82E7258B41E11569A987E5182A05F538085040D36F6E17263BCC2963287D4EE4ED4A01A4E736E44614F8115C9B2B828BBB0C02 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70312E9A300D47E3BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373DBA3D7E24987517EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38B6F1F7B995052D5CE78FAEFB5AE5E09FA3A76B6063C69A9D0CC7F00164DA146DAFE8445B8C89999728AA50765F790063741F7343E26298569389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8A0BCD6C998BE2772F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CB81C09904DE36E566136E347CC761E074AD6D5ED66289B52698AB9A7B718F8C46E0066C2D8992A16725E5C173C3A84C3BFFF513DCDB8CC61BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE754A400A07F115C59731C566533BA786AA5CC5B56E945C8DA X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D341E08D7EE1804B763B61C4F96B6BD7C0A1D9A72DE1C065DF7B09FD3039B6B83C7D119B97ECAFA62801D7E09C32AA3244CD41A4D92123B4E1D374D55EA1299BE5BD08D48398F32B4A6927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojniwsktXAgUPz3fxqqVZvEQ== X-Mailru-Sender: 5AA3D5B9D8C486464BD4402E82A444E3112A82265FC07073F5D0B49987267F2D941B964D27F906A319381EE24192DF5555834048F03EF5D4C9A814A92B2E3B1BA4250FC3964EA4964198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v4 7/8] Fix build with busybox grep. 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: sergos via Tarantool-patches Reply-To: sergos Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the patch! LGTM Sergos > On 28 Oct 2022, at 12:26, Maksim Kokryashkin = wrote: >=20 > From: Mike Pall >=20 > Reported by ymph. >=20 > (cherry picked from commit 66563bdab0c7acf3cd61dc6cfcca36275951d084) >=20 > Busybox implementation of grep doesn't have the `-U` option, but it > has the option to treat the binary as a text file, so that case is > provided as an alternative. >=20 > Maxim Kokryashkin: > * added the description for the problem and updated the CMake >=20 > Needed for tarantool/tarantool#6096 > Part of tarantool/tarantool#7230 > --- > cmake/SetTargetFlags.cmake | 2 +- > src/Makefile.original | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/cmake/SetTargetFlags.cmake b/cmake/SetTargetFlags.cmake > index 943a3152..8abb6288 100644 > --- a/cmake/SetTargetFlags.cmake > +++ b/cmake/SetTargetFlags.cmake > @@ -23,7 +23,7 @@ else() > string(FIND ${TARGET_C_FLAGS} "LJ_NO_UNWIND 1" UNWIND_POS) > if(UNWIND_POS EQUAL -1) > execute_process( > - COMMAND bash -c "exec 2>/dev/null; echo 'extern void = b(void);int a(void){b();return 0;}' | ${CMAKE_C_COMPILER} -c -x c - -o = tmpunwind.o && grep -qU -e eh_frame -e __unwind_info tmpunwind.o && echo = E; rm -f tmpunwind.o" > + COMMAND bash -c "exec 2>/dev/null; echo 'extern void = b(void);int a(void){b();return 0;}' | ${CMAKE_C_COMPILER} -c -x c - -o = tmpunwind.o && { grep -qa -e eh_frame -e __unwind_info tmpunwind.o || = grep -qU -e eh_frame -e __unwind_info tmpunwind.o; } && echo E; rm -f = tmpunwind.o" > WORKING_DIRECTORY ${LUAJIT_SOURCE_DIR} > OUTPUT_VARIABLE TESTUNWIND > RESULT_VARIABLE TESTUNWIND_RC > diff --git a/src/Makefile.original b/src/Makefile.original > index 4d7cda3e..2d014e43 100644 > --- a/src/Makefile.original > +++ b/src/Makefile.original > @@ -344,7 +344,7 @@ ifeq (iOS,$(TARGET_SYS)) > else > ifeq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH))) > # Find out whether the target toolchain always generates unwind = tables. > - TARGET_TESTUNWIND=3D$(shell exec 2>/dev/null; echo 'extern void = b(void);int a(void){b();return 0;}' | $(TARGET_CC) -c -x c - -o = tmpunwind.o && grep -qU -e eh_frame -e __unwind_info tmpunwind.o && echo = E; rm -f tmpunwind.o) > + TARGET_TESTUNWIND=3D$(shell exec 2>/dev/null; echo 'extern void = b(void);int a(void){b();return 0;}' | $(TARGET_CC) -c -x c - -o = tmpunwind.o && { grep -qa -e eh_frame -e __unwind_info tmpunwind.o || = grep -qU -e eh_frame -e __unwind_info tmpunwind.o; } && echo E; rm -f = tmpunwind.o) > ifneq (,$(findstring E,$(TARGET_TESTUNWIND))) > TARGET_XCFLAGS+=3D -DLUAJIT_UNWIND_EXTERNAL > endif > --=20 > 2.37.0 (Apple Git-136) >=20