diff --git a/.checkpackageignore b/.checkpackageignore index 4be4ab4f27..806a225ab1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -136,7 +136,6 @@ package/4th/0001-avoid-regen-during-install.patch Upstream package/ace/0001-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch Upstream package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch Upstream package/acl/0001-Build-with-old-GCC-versions.patch Upstream -package/acpica/0001-build-do-not-use-Werror.patch Upstream package/acpid/0001-dont-use-isfdtype.patch Upstream package/alchemy/0001-toolchains-remove-hash-style-management.patch Upstream package/alsamixergui/0001-misc-fixes.patch Sob Upstream diff --git a/package/acpica/0001-build-do-not-use-Werror.patch b/package/acpica/0001-build-do-not-use-Werror.patch deleted file mode 100644 index f905e552bd..0000000000 --- a/package/acpica/0001-build-do-not-use-Werror.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 9382ae2431d2962c430e7149302c8690f5bc159c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 10 Jul 2016 15:06:15 +0200 -Subject: [PATCH] build: do not use -Werror - -Warnings come and go with various compiler versions, so using -Werror is -prone to cause build failures with various compiler versions, especially -newer versions that introduce new warnings. - -Remove use of -Werror. - -[Vincent: tweak patch for 20170531 release] -[Bernd: tweak patch for 20191018 release] - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: "Vicente Olivert Riera" -Signed-off-by: Bernd Kuhls ---- - generate/unix/Makefile.config | 1 - - generate/unix/iasl/Makefile | 16 ++++++++-------- - 2 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config -index c28e8a9b1..7064bed97 100644 ---- a/generate/unix/Makefile.config -+++ b/generate/unix/Makefile.config -@@ -204,7 +204,6 @@ CWARNINGFLAGS = \ - -Wall\ - -Wbad-function-cast\ - -Wdeclaration-after-statement\ -- -Werror\ - -Wformat=2\ - -Wmissing-declarations\ - -Wmissing-prototypes\ -diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile -index 47ea73cab..2c756af79 100644 ---- a/generate/unix/iasl/Makefile -+++ b/generate/unix/iasl/Makefile -@@ -360,32 +360,32 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse - # - $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtcompilerparserlex.o : $(OBJDIR)/dtcompilerparserlex.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtcompilerparserparse.o : $(OBJDIR)/dtcompilerparserparse.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< --- -2.20.1 - diff --git a/package/acpica/Config.in b/package/acpica/Config.in index c5ffb005f5..ec5865c357 100644 --- a/package/acpica/Config.in +++ b/package/acpica/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ACPICA bool "acpica" + depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS help The ACPI Component Architecture (ACPICA) project provides an @@ -9,5 +10,5 @@ config BR2_PACKAGE_ACPICA https://www.acpica.org -comment "acpica needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "acpica needs a toolchain w/ threads, wchar" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index 564e393cb4..dd9f8a1d22 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,3 +1,5 @@ +# From: https://www.intel.com/content/www/us/en/download/776303/acpi-component-architecture-downloads-unix-format-source-code-and-build-environment-with-an-intel-license.html +sha1 3b893fb771cf3fbd3531de3036e1a5bfc624c9d2 acpica-unix-20230628.tar.gz # locally computed hash -sha256 1ccda5c6a08a90b145777df635eb09f995b3472b3128f375009c5a6b01a04c7a acpica-unix2-20220331.tar.gz -sha256 40d8e351f8dfdf5340ec76ac28f0c201b825077d7060bb3686ca1112cb26985d source/include/acpi.h +sha256 86876a745e3d224dcfd222ed3de465b47559e85811df2db9820ef09a9dff5cce acpica-unix-20230628.tar.gz +sha256 905d6f191f3c29aa673602d9c66eb8df00f7e1b35064a081e0de81284ff17ee6 source/include/acpi.h diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index 9901c1ed48..81f7d8e103 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACPICA_VERSION = 20220331 -ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz -ACPICA_SITE = https://acpica.org/sites/acpica/files +ACPICA_VERSION = 20230628 +ACPICA_SOURCE = acpica-unix-$(ACPICA_VERSION).tar.gz +ACPICA_SITE = https://downloadmirror.intel.com/783534 ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 ACPICA_LICENSE_FILES = source/include/acpi.h ACPICA_DEPENDENCIES = host-bison host-flex @@ -15,11 +15,13 @@ HOST_ACPICA_DEPENDENCIES = host-bison host-flex define ACPICA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ HARDWARE_NAME=$(BR2_ARCH) HOST=_LINUX CC="$(TARGET_CC)" \ + NOWERROR=TRUE \ all endef define HOST_ACPICA_BUILD_CMDS $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + NOWERROR=TRUE \ all endef