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 1B23B7036F; Tue, 6 Dec 2022 00:46:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1B23B7036F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1670276780; bh=cxH28AhJskFIe+dbo7302TfjU5Z7vXvDDrL9lNGieN0=; 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=IuSMaUcdSFlB62hX7PbpuaKEFXfaaXxZdgAuSbt3HDqhYBbxaK5lwk4tfPtUNMg01 om2nwz8W8cW/LN/gEOIeEIY4tQSLsEhtDYHs+t4SqorUOp+ciJlszlmpsIJJYg8HSj BwAfjV1hvlj/OZsNT/YFMzqZbmB17ueq9kCMcQ8E= 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 B91CF7036F for ; Tue, 6 Dec 2022 00:46:18 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B91CF7036F Received: by smtp50.i.mail.ru with esmtpa (envelope-from ) id 1p2JI1-0007wo-Ru; Tue, 06 Dec 2022 00:46:18 +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-7-max.kokryashkin@gmail.com> Date: Tue, 6 Dec 2022 00:46:07 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20221028092638.11506-1-max.kokryashkin@gmail.com> <20221028092638.11506-7-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: 4F1203BC0FB41BD908190A22B884CF14ED37B92A3B9588C6377108C7F4BE2C30182A05F5380850403B7B7BB9F421C7886B9B365FAC7A202CA64F598115DBFF99D5BE668283D2697D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70CB15FA6C489297DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063761A26A2A89ED60DE8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D842DAA8BD76466DBB7173F698610D4536117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3733B5EC72352B9FA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520C24E1E72F37C03A0CB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE7B96B19DC40933216E0066C2D8992A164AD6D5ED66289B52698AB9A7B718F8C46E0066C2D8992A16725E5C173C3A84C3A340EB951D1887B6BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7A3CCBC2573AEBDE1C4224003CC83647689D4C264860C145E X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D340B06C327CE4A70E8CE79B2C2DAA215391CD546224AB3488EDA8ED1462A76AF3C70F44322049F1AD71D7E09C32AA3244C03D99AD5CBE318657471BE63BBD2837C8A6D4CC6FBFAC251927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojniwsktXAgUM3gpZaNYSGkw== X-Mailru-Sender: 5AA3D5B9D8C486464BD4402E82A444E3F4526EB62DD638EA3ADBB3370ADB220669EDD486DBEDDF2919381EE24192DF5555834048F03EF5D4C9A814A92B2E3B1BA4250FC3964EA4964198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v4 6/8] BSD: Fix build with BSD 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 > Thanks to carlocab. >=20 > (cherry picked from commit b9d523965b3f55b19345a1ed1ebc92e431747ce1) >=20 > The `-U` option makes grep process the temporary binary file as > a binary instead of text, meaning that its contents are passed > to grep verbatim. >=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 d99e1f9a..943a3152 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 -qa -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 -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 5826a56a..4d7cda3e 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 -qa -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 -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