From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-f45.google.com (mail-it0-f45.google.com [209.85.214.45]) by mail.openembedded.org (Postfix) with ESMTP id 4C0B3773EE for ; Fri, 27 Jan 2017 15:30:58 +0000 (UTC) Received: by mail-it0-f45.google.com with SMTP id d9so9844095itc.0 for ; Fri, 27 Jan 2017 07:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gRIdKrs7459Hqo6RdBi2tazwD/WZKGh9ePQ6Ggp/+MQ=; b=EMbk1+lvW7s7TyJs8LHPPzlyXB15SlphO7s/34GJMoSj0/oINVr8VCnTYwCuHdAogb wSG7I3MXgRBPfPE0/JmXD1SL122zsEXp9y+rcoAVtZ6VriydmfnJ+31Yw380jAIlvCJR CVVkkILrz31crjJpYw0zwJdZSUsLaNMz0knHvl/xOAK9vEd3u2V0NWuEIcdvi+G/hB6E FK4Pjr+fCO4LAhTgWH75IrTVG5jjDX6QPClAz6p7FSicy5Q8hUx+TGCmVd9IgTQZlHl1 teiQ67UMfr8xMol6jAPSdaFYfXNO9Rr/j3TNxmmfh0iJKN1SMYaPAOvIyHbpOQ3wfJzq fQbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gRIdKrs7459Hqo6RdBi2tazwD/WZKGh9ePQ6Ggp/+MQ=; b=PhdpFIRfMgkl6dc4s2NS17bgYgIMgXfwfW96nUbyqp3myvD7QcLcJIfK2I7pKh+9rU sR51y/3qwWFmOixwYuV4DHJrHHurKEKTn7n3onPAN1mHdDqgcazkFvVdXSdoX2p2OkRf b7Qr0krBjhPPvPRqIQzd6DAhLmcud+549OiT3p5gKBO/GN7q0xfzQNF/jTbU+98wT19O MTEPidyuri3HCtOe1qoDNMWrUsCXT9+xRMX8S3cV41cSde2msG66wlWPNaMX/spZ6Lue tUalIT0rX9vPnIy3dw3tHm6zZZ67db2+OcUVRry9U/2PvvuTipUiZEfYaPmAXzGOGoBG kIEA== X-Gm-Message-State: AIkVDXJNZ1fYqoYuqVCYrR2k1prF4L12EAV8mDgqlJVhSOqSblTdEISf105bHLLvnMG9YNKP X-Received: by 10.36.65.105 with SMTP id x102mr3507662ita.32.1485531059076; Fri, 27 Jan 2017 07:30:59 -0800 (PST) Received: from pohly-desktop.fritz.box (p5DE8DB2E.dip0.t-ipconnect.de. [93.232.219.46]) by smtp.gmail.com with ESMTPSA id a128sm1542174itg.22.2017.01.27.07.30.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 07:30:57 -0800 (PST) From: Patrick Ohly To: openembedded-core@lists.openembedded.org Date: Fri, 27 Jan 2017 16:30:32 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Subject: [PATCH v5 02/12] acpica: work around flex 2.6.2 code generation issue X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2017 15:30:59 -0000 Without this patch, linking fails with a missing implementation of yy_scan_string. This looks like a regression in flex, because 2.6.0 generated different code that called PrParser_scan_string resp. DtParser_scan_string. Working around that in acpica until this is better understood or fixed in flex is the easiest solution for now. Signed-off-by: Patrick Ohly --- meta/recipes-extended/acpica/acpica_20150515.bb | 1 + meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch diff --git a/meta/recipes-extended/acpica/acpica_20150515.bb b/meta/recipes-extended/acpica/acpica_20150515.bb index de897e1..c23b491 100644 --- a/meta/recipes-extended/acpica/acpica_20150515.bb +++ b/meta/recipes-extended/acpica/acpica_20150515.bb @@ -18,6 +18,7 @@ DEPENDS = "bison flex" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ file://no-werror.patch \ + file://rename-yy_scan_string-manually.patch \ " SRC_URI[md5sum] = "2bc4a7ccc82de9df9fa964f784ecb29c" SRC_URI[sha256sum] = "61204ec56d71bc9bfa2ee2ade4c66f7e8541772ac72ef8ccc20b3f339cc96374" diff --git a/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch b/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch new file mode 100644 index 0000000..b62ca25 --- /dev/null +++ b/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch @@ -0,0 +1,64 @@ +From 2ab61e6ad5a9cfcde838379bc36babfaaa61afb8 Mon Sep 17 00:00:00 2001 +From: Patrick Ohly +Date: Fri, 20 Jan 2017 13:50:17 +0100 +Subject: [PATCH] rename yy_scan_string manually + +flex 2.6.0 used to generate code where yy_scan_string was mapped +to _scan_string directly in the generated .c code. + +For example, generate/unix/iasl/obj/prparserlex.c: + +int +PrInitLexer ( + char *String) +{ + + LexBuffer = PrParser_scan_string (String); + return (LexBuffer == NULL); +} + +flex 2.6.3 no longer does that, leading to a compiler warning +and link error about yy_scan_string(). + +Both versions generate a preamble in the beginning of prparserlex.c +that maps several yy_* names, but yy_scan_string is not among those: + +... +... + +Upstream-Status: Inappropriate [workaround for https://github.com/westes/flex/issues/164] +Signed-off-by: Patrick Ohly +--- + source/compiler/dtparser.l | 2 +- + source/compiler/prparser.l | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/compiler/dtparser.l b/source/compiler/dtparser.l +index 3f4c2f3..eaa43ff 100644 +--- a/source/compiler/dtparser.l ++++ b/source/compiler/dtparser.l +@@ -120,7 +120,7 @@ DtInitLexer ( + char *String) + { + +- LexBuffer = yy_scan_string (String); ++ LexBuffer = DtParser_scan_string (String); + return (LexBuffer == NULL); + } + +diff --git a/source/compiler/prparser.l b/source/compiler/prparser.l +index 10bd130..9cb3573 100644 +--- a/source/compiler/prparser.l ++++ b/source/compiler/prparser.l +@@ -127,7 +127,7 @@ PrInitLexer ( + char *String) + { + +- LexBuffer = yy_scan_string (String); ++ LexBuffer = PrParser_scan_string (String); + return (LexBuffer == NULL); + } + +-- +2.11.0 + -- git-series 0.9.1