fwts: Upgrade to 22.11.00

Forward port 0003-Remove-Werror-from-build.patch
Add a patch to fix parallel build race condition

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-12-01 15:48:42 -08:00
parent e04955a65d
commit 6a9ed97fe1
3 changed files with 75 additions and 6 deletions
@@ -0,0 +1,68 @@
From 6135a318dd48787f1b6e1296c755d67575f44dc1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 1 Dec 2022 15:18:55 -0800
Subject: [PATCH] libfwtsiasl: Disable parallel builds of lex/bison files
Since they are using mv cmds they maybe conflicting with each other in
highly parallelized build resulting in errors like
| mv dtcompilerparser.tab.c dtcompilerparser.c
| mv dtcompilerparser.tab.c dtcompilerparser.c
| cp dtcompilerparser.tab.h dtcompilerparser.y.h
| mv dtcompilerparser.tab.c dtcompilerparser.c
| mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory
| make[3]: *** [Makefile:4196: dtcompilerparser.c] Error 1
| make[3]: *** Waiting for unfinished jobs....
| mv: cannot stat 'dtcompilerparser.tab.c': No such file or directory
| make[3]: *** [Makefile:4194: dtcompilerparser.y.h] Error 1
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/libfwtsiasl/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/src/libfwtsiasl/Makefile.am
+++ b/src/libfwtsiasl/Makefile.am
@@ -58,32 +58,24 @@ aslcompiler.y: $(ASL_PARSER)
aslcompilerlex.c: $(ASL_LEXER)
${LEX} ${AM_LFLAGS} -PAslCompiler -o$@ $(top_srcdir)/src/acpica/source/compiler/aslcompiler.l
-.NOTPARALLEL: aslcompiler.c
+.NOTPARALLEL: aslcompiler.c aslcompiler.y.h
aslcompiler.c aslcompiler.y.h: aslcompiler.y
- ${YACC} ${AM_YFLAGS} -d -baslcompiler -pAslCompiler $^
- mv aslcompiler.tab.c aslcompiler.c
- cp aslcompiler.tab.h aslcompiler.y.h
+ ${YACC} ${AM_YFLAGS} -d -baslcompiler -pAslCompiler --header=aslcompiler.y.h --output=aslcompiler.c $^
-.NOTPARALLEL: dtcompilerparserlex.c
+.NOTPARALLEL: dtcompilerparserlex.c dtcompilerparser.c dtcompilerparser.y.h
dtcompilerparserlex.c dtcompilerparser.c dtcompilerparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.l $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y
${LEX} ${AM_LFLAGS} -PDtCompilerParser -odtcompilerparserlex.c $<
- ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y
- mv dtcompilerparser.tab.c dtcompilerparser.c
- cp dtcompilerparser.tab.h dtcompilerparser.y.h
+ ${YACC} ${AM_YFLAGS} -bdtcompilerparser -pDtCompilerParser --header=dtcompilerparser.y.h --output=dtcompilerparser.c $(top_srcdir)/src/acpica/source/compiler/dtcompilerparser.y
-.NOTPARALLEL: dtparserlex.c
+.NOTPARALLEL: dtparserlex.c dtparser.c dtparser.y.h
dtparserlex.c dtparser.c dtparser.y.h: $(top_srcdir)/src/acpica/source/compiler/dtparser.l $(top_srcdir)/src/acpica/source/compiler/dtparser.y
${LEX} ${AM_LFLAGS} -PDtParser -odtparserlex.c $<
- ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser $(top_srcdir)/src/acpica/source/compiler/dtparser.y
- mv dtparser.tab.c dtparser.c
- cp dtparser.tab.h dtparser.y.h
+ ${YACC} ${AM_YFLAGS} -bdtparser -pDtParser --header=dtparser.y.h --output=dtparser.c $(top_srcdir)/src/acpica/source/compiler/dtparser.y
-.NOTPARALLEL: prparserlex.c
+.NOTPARALLEL: prparserlex.c prparser.c prparser.y.h
prparserlex.c prparser.c prparser.y.h: $(top_srcdir)/src/acpica/source/compiler/prparser.l $(top_srcdir)/src/acpica/source/compiler/prparser.y
${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c $<
- ${YACC} ${AM_YFLAGS} -bprparser -pPrParser $(top_srcdir)/src/acpica/source/compiler/prparser.y
- mv prparser.tab.c prparser.c
- cp prparser.tab.h prparser.y.h
+ ${YACC} ${AM_YFLAGS} -bprparser -pPrParser --header=prparser.y.h --output=prparser.c $(top_srcdir)/src/acpica/source/compiler/prparser.y
pkglib_LTLIBRARIES = libfwtsiasl.la
@@ -15,7 +15,7 @@ Upstream-Status: Pending
@@ -13,7 +13,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/efi_runtime \
-I$(top_srcdir)/smccc_test \
-pthread `pkg-config --cflags glib-2.0 gio-2.0` \
-pthread \
- -Wall -Werror -Wextra \
+ -Wall -Wextra \
-Wno-address-of-packed-member \
@@ -23,9 +23,9 @@ Upstream-Status: Pending
-Wno-long-long -Wredundant-decls -Wshadow \
--- a/src/lib/src/Makefile.am
+++ b/src/lib/src/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
`pkg-config --silence-errors --cflags json-c` \
`pkg-config --cflags glib-2.0 gio-2.0` \
@@ -22,7 +22,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/acpica/source/include \
-I$(top_srcdir)/src/acpica/source/compiler \
-DDATAROOTDIR=\"$(datarootdir)\" \
- -Wall -Werror -Wextra \
+ -Wall -Wextra \
@@ -11,12 +11,13 @@ SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \
file://0004-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \
file://0005-Undefine-PAGE_SIZE.patch \
file://0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \
file://0001-libfwtsiasl-Disable-parallel-builds-of-lex-bison-fil.patch \
"
SRC_URI[sha256sum] = "45045a095d9933d9ff39712372ab1f3078ca8e29c007b3f97b810cdb8c27b5c3"
SRC_URI[sha256sum] = "4af4e1e0f1ae9313297af722d744ba47a81c81bc5bdeab3f4f40837a39e4b808"
COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux"
DEPENDS = "libpcre glib-2.0 dtc bison-native libbsd"
DEPENDS = "libpcre glib-2.0 dtc bison-native flex-native libbsd"
DEPENDS:append:libc-musl = " libexecinfo"
inherit autotools bash-completion pkgconfig