commit: 62664c3963b4b47b916e7ebbf084ca6b98020e55 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Wed May 11 04:27:22 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 13 20:12:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62664c39
sys-apps/fwts: Add 22.03.00 This adds two patches to fix the build with slibtool and to remove -Werror. Bug: https://bugs.gentoo.org/780372 Upstream-ML: https://lists.ubuntu.com/archives/fwts-devel/2022-May/013515.html Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/25434 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/fwts/Manifest | 1 + sys-apps/fwts/files/fwts-22.03.00-slibtool.patch | 155 +++++++++++++++++++++++ sys-apps/fwts/files/fwts-22.03.00-werror.patch | 65 ++++++++++ sys-apps/fwts/fwts-22.03.00.ebuild | 51 ++++++++ 4 files changed, 272 insertions(+) diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest index 76af3596efb7..b330c0790e85 100644 --- a/sys-apps/fwts/Manifest +++ b/sys-apps/fwts/Manifest @@ -1 +1,2 @@ DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55 +DIST fwts_22.03.00.orig.tar.gz 3900335 BLAKE2B 2e36392f69140b1a2d3b77cc8d57740f66ea016063644916e69bb738e20191a780a9d2ed275cfd8b871ad8c3455f96c8ae26ab7c1574c0cc8efdbbb20f4cc785 SHA512 88f183293da4f6ebc1cefc382c9b5e1b378ac7d03e0c577937db89be9e8417e0ffdf0952cdffda57ac21787c3fe02c5254ec7ce61e100e78555ffa92d6a30dc2 diff --git a/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch b/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch new file mode 100644 index 000000000000..bc66006bf674 --- /dev/null +++ b/sys-apps/fwts/files/fwts-22.03.00-slibtool.patch @@ -0,0 +1,155 @@ +Upstream-ML: https://lists.ubuntu.com/archives/fwts-devel/2022-May/013515.html + +From 47bc82375865e2548edcb1607ca52ec60d632123 Mon Sep 17 00:00:00 2001 +From: orbea <or...@riseup.net> +Date: Tue, 10 May 2022 20:35:01 -0700 +Subject: [PATCH 1/2] build: Improve linking + +This improves the linking enough to get the build to complete +with slibtool and GNU libtool. +--- + configure.ac | 2 ++ + src/Makefile.am | 20 ++++++++++---------- + src/lib/src/Makefile.am | 18 ++++++++++-------- + src/libfwtsacpica/Makefile.am | 7 ++----- + src/libfwtsiasl/Makefile.am | 4 ++-- + 5 files changed, 26 insertions(+), 25 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f40c367..7ee5604 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,6 +64,8 @@ + AC_CHECK_HEADERS([asm/opal-prd.h]) + AC_CHECK_HEADERS([mtd/mtd-abi.h]) + AC_CHECK_HEADERS([pci/pci.h]) ++ PKG_CHECK_MODULES([GIO], [gio-2.0]) ++ PKG_CHECK_MODULES([GLIB], [glib-2.0]) + AM_CONDITIONAL([HAVE_ASM_OPAL_PRD_H], + [test "x$ac_cv_header_asm_opal_prd_h" = "xyes"]) + AM_CONDITIONAL([HAVE_MTD_ABI_H], +diff --git a/src/Makefile.am b/src/Makefile.am +index 9a26af8..e2180e7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/acpica/source/compiler \ + -I$(top_srcdir)/efi_runtime \ + -I$(top_srcdir)/smccc_test \ +- -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ ++ -pthread \ + -Wall -Werror -Wextra \ + -Wno-address-of-packed-member \ + -Wfloat-equal -Wmissing-declarations \ +@@ -23,7 +23,11 @@ AM_CPPFLAGS = \ + + bin_PROGRAMS = fwts + +-fwts_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT ++fwts_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ @GIO_CFLAGS@ \ ++ @GLIB_CFLAGS@ \ ++ -DACPI_DEBUG_OUTPUT + + if HAVE_LIBFDT + dt_tests = \ +@@ -207,16 +211,12 @@ fwts_SOURCES = main.c \ + $(power_mgmt_tests) \ + $(dt_tests) + +-fwts_LDFLAGS = -lm -lbsd `pkg-config --libs glib-2.0 gio-2.0` ++fwts_LDFLAGS = -no-undefined + + fwts_LDADD = \ +- -lfwts \ +- -L$(top_builddir)/src \ +- -L$(top_builddir)/src/acpica \ +- -L$(top_builddir)/src/libfwtsiasl \ +- -L$(top_builddir)/src/libfwtsacpica \ +- -L$(top_builddir)/src/lib/src \ +- -lfwtsacpica ++ $(top_builddir)/src/lib/src/libfwts.la \ ++ $(top_builddir)/src/libfwtsiasl/libfwtsiasl.la \ ++ $(top_builddir)/src/libfwtsacpica/libfwtsacpica.la + + man_MANS = ../doc/fwts.1 ../doc/fwts-collect.1 ../doc/fwts-frontend-text.1 + +diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am +index 0a39882..94bfcdf 100644 +--- a/src/lib/src/Makefile.am ++++ b/src/lib/src/Makefile.am +@@ -21,22 +21,24 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libfwtsiasl \ + -I$(top_srcdir)/src/acpica/source/include \ + -I$(top_srcdir)/src/acpica/source/compiler \ +- `pkg-config --silence-errors --cflags json` \ +- `pkg-config --silence-errors --cflags json-c` \ +- `pkg-config --cflags glib-2.0 gio-2.0` \ + -DDATAROOTDIR=\"$(datarootdir)\" \ + -Wall -Werror -Wextra \ + -Wno-address-of-packed-member + + pkglib_LTLIBRARIES = libfwts.la + +-libfwts_la_LDFLAGS = \ ++libfwts_la_LDFLAGS = -version-info 1:0:0 ++ ++libfwts_la_LIBADD = \ + -lm -lpthread -lbsd \ +- -version-info 1:0:0 \ +- -L$(top_builddir)/src/libfwtsiasl \ +- -lfwtsiasl `pkg-config --libs glib-2.0 gio-2.0` ++ @GIO_LIBS@ \ ++ @GLIB_LIBS@ + +-libfwts_la_CPPFLAGS = $(AM_CPPFLAGS) -DACPI_DEBUG_OUTPUT ++libfwts_la_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ @GIO_CFLAGS@ \ ++ @GLIB_CFLAGS@ \ ++ -DACPI_DEBUG_OUTPUT + + if HAVE_LIBFDT + dt_sources = \ +diff --git a/src/libfwtsacpica/Makefile.am b/src/libfwtsacpica/Makefile.am +index f37f585..62f0d8c 100644 +--- a/src/libfwtsacpica/Makefile.am ++++ b/src/libfwtsacpica/Makefile.am +@@ -74,7 +74,8 @@ CLEANFILES = osunixxf_munged.c \ + + pkglib_LTLIBRARIES = libfwtsacpica.la + +-libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0 ++libfwtsacpica_la_LDFLAGS = -version-info 1:0:0 ++libfwtsacpica_la_LIBADD = -lpthread + libfwtsacpica_la_CPPFLAGS = $(AM_CPPFLAGS) + + # +@@ -280,8 +281,4 @@ libfwtsacpica_la_SOURCES = \ + ../../src/acpica/source/tools/acpiexec/aeinstall.c \ + ../../src/acpica/source/os_specific/service_layers/osgendbg.c + +-libfwtsacpica_la_LIBADD = \ +- -L../../src/lib/src -lfwts -lrt +- +- + -include ../../git.mk +diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am +index 328134c..2728780 100644 +--- a/src/libfwtsiasl/Makefile.am ++++ b/src/libfwtsiasl/Makefile.am +@@ -104,8 +104,8 @@ BUILT_SOURCES = aslcompiler.y \ + # + # Just export fwts specific API so we don't clash with core ACPICA library + # +-libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -lpthread -version-info 1:0:0 +- ++libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -version-info 1:0:0 ++libfwtsiasl_la_LIBADD = -lpthread + CLEANFILES = $(BUILT_SOURCES) + + libfwtsiasl_la_CPPFLAGS = $(AM_CPPFLAGS) +-- +2.35.1 + diff --git a/sys-apps/fwts/files/fwts-22.03.00-werror.patch b/sys-apps/fwts/files/fwts-22.03.00-werror.patch new file mode 100644 index 000000000000..6502c75b7413 --- /dev/null +++ b/sys-apps/fwts/files/fwts-22.03.00-werror.patch @@ -0,0 +1,65 @@ +From 85f27bc6dcd8c7f1479dce259713540f1d1a888c Mon Sep 17 00:00:00 2001 +From: orbea <or...@riseup.net> +Date: Tue, 10 May 2022 21:11:29 -0700 +Subject: [PATCH 2/2] build: Remove -Werror + +--- + configure.ac | 2 +- + src/Makefile.am | 2 +- + src/lib/src/Makefile.am | 2 +- + src/utilities/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7ee5604..4d2960e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([fwts],[0.1],[fwts-de...@lists.ubuntu.com]) +- AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AC_CANONICAL_HOST + AC_CONFIG_MACRO_DIR([m4]) +diff --git a/src/Makefile.am b/src/Makefile.am +index e2180e7..eee8b49 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,7 +13,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/efi_runtime \ + -I$(top_srcdir)/smccc_test \ + -pthread \ +- -Wall -Werror -Wextra \ ++ -Wall -Wextra \ + -Wno-address-of-packed-member \ + -Wfloat-equal -Wmissing-declarations \ + -Wno-long-long -Wredundant-decls -Wshadow \ +diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am +index 94bfcdf..390326a 100644 +--- a/src/lib/src/Makefile.am ++++ b/src/lib/src/Makefile.am +@@ -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 \ + -Wno-address-of-packed-member + + pkglib_LTLIBRARIES = libfwts.la +diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am +index a7d9b9c..2356af3 100644 +--- a/src/utilities/Makefile.am ++++ b/src/utilities/Makefile.am +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # + +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + -I$(srcdir)/../lib/include + + bin_PROGRAMS = kernelscan +-- +2.35.1 + diff --git a/sys-apps/fwts/fwts-22.03.00.ebuild b/sys-apps/fwts/fwts-22.03.00.ebuild new file mode 100644 index 000000000000..a5bfacb685c1 --- /dev/null +++ b/sys-apps/fwts/fwts-22.03.00.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Firmware Test Suite" +HOMEPAGE="https://kernel.ubuntu.com/git/hwe/fwts.git"; +SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-libs/glib:2 + >=dev-libs/json-c-0.10-r1 + dev-libs/libbsd + dev-libs/libpcre + sys-apps/dmidecode + sys-apps/dtc + sys-apps/pciutils + sys-power/iasl + sys-power/pmtools +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +S=${WORKDIR} + +PATCHES=( + "${FILESDIR}/${P}-slibtool.patch" # 780372 + "${FILESDIR}/${P}-werror.patch" +) + +src_prepare() { + default + + sed -e 's:/usr/bin/lspci:'$(type -p lspci)':' \ + -e 's:/usr/sbin/dmidecode:'$(type -p dmidecode)':' \ + -e 's:/usr/bin/iasl:'$(type -p iasl)':' \ + -i src/lib/include/fwts_binpaths.h || die + + eautoreconf +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +}
