Date: Mon, 20 Oct 2025 09:07:54 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b8b2479a4bd4 - main - ports-mgmt/appstream-generator: unbreak build on 32bit ARCHes (+) Message-ID: <202510200907.59K97swS028871@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8b2479a4bd4835fec503c15f487b040d9be524c commit b8b2479a4bd4835fec503c15f487b040d9be524c Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2025-10-20 09:02:35 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2025-10-20 09:07:48 +0000 ports-mgmt/appstream-generator: unbreak build on 32bit ARCHes (+) On a 32bit architectures onetbb installs pkgconfig file as tbb32.pc Also fix variable size for numCPU to pass build on i386, bump PORTREVISION Reported by: arrowd, pkg-fallout --- ports-mgmt/appstream-generator/Makefile | 11 ++++++++++- ports-mgmt/appstream-generator/files/patch-src_config.h | 11 +++++++++++ ports-mgmt/appstream-generator/files/patch-src_engine.cpp | 11 ++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ports-mgmt/appstream-generator/Makefile b/ports-mgmt/appstream-generator/Makefile index a8d0b26d435c..d52b76e5a107 100644 --- a/ports-mgmt/appstream-generator/Makefile +++ b/ports-mgmt/appstream-generator/Makefile @@ -1,6 +1,7 @@ PORTNAME= appstream-generator DISTVERSIONPREFIX= v DISTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= ports-mgmt MAINTAINER= arrowd@FreeBSD.org @@ -42,9 +43,17 @@ CFLAGS+= -fexperimental-library DATADIR= ${PREFIX}/share/appstream OPTIONS_SUB= yes +.include <bsd.port.pre.mk> + +.if ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH:Marmv?} +post-patch: + @${REINPLACE_CMD} -e "/tbb_dep/s|'tbb'|'tbb32'|" \ + ${WRKSRC}/meson.build +.endif + post-install: cd ${WRKSRC}/data && \ ${COPYTREE_SHARE} templates ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${PATCHDIR}/poudriere-hook-bulk.sh ${STAGEDIR}${DATADIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/ports-mgmt/appstream-generator/files/patch-src_config.h b/ports-mgmt/appstream-generator/files/patch-src_config.h new file mode 100644 index 000000000000..f53b0ebb8062 --- /dev/null +++ b/ports-mgmt/appstream-generator/files/patch-src_config.h @@ -0,0 +1,11 @@ +--- src/config.h.orig 2025-10-02 19:33:23 UTC ++++ src/config.h +@@ -44,7 +44,7 @@ inline constexpr std::array<ImageSize, 6> AllowedIconS + /** + * Fake package name AppStream Generator uses internally to inject additional metainfo on users' request + */ +-inline constexpr std::string EXTRA_METAINFO_FAKE_PKGNAME = "+extra-metainfo"; ++inline const std::string EXTRA_METAINFO_FAKE_PKGNAME = "+extra-metainfo"; + + /** + * Describes a suite in a software repository. diff --git a/ports-mgmt/appstream-generator/files/patch-src_engine.cpp b/ports-mgmt/appstream-generator/files/patch-src_engine.cpp index 5bf92fa33c1a..d99f8a59a7e8 100644 --- a/ports-mgmt/appstream-generator/files/patch-src_engine.cpp +++ b/ports-mgmt/appstream-generator/files/patch-src_engine.cpp @@ -1,4 +1,4 @@ ---- src/engine.cpp.orig 2025-09-25 21:14:13 UTC +--- src/engine.cpp.orig 2025-10-02 19:33:23 UTC +++ src/engine.cpp @@ -35,6 +35,7 @@ @@ -8,3 +8,12 @@ #include <tbb/blocked_range.h> #include <tbb/task_arena.h> #include <inja/inja.hpp> +@@ -68,7 +69,7 @@ Engine::Engine() + // Configure a TBB task arena to limit parallelism a little (use half the available CPU cores, or at least 6 + // threads) This avoids having too many parallel downloads on high-core-count machines, and also leaves some room + // for additional parallelism of the used libraries, e.g. for image processing. +- const auto numCPU = std::thread::hardware_concurrency(); ++ std::int32_t const numCPU = std::thread::hardware_concurrency(); + const auto maxThreads = std::max(numCPU > 6 ? 6L : numCPU, std::lround(numCPU * 0.60)); + m_taskArena = std::make_unique<tbb::task_arena>(maxThreads); +home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510200907.59K97swS028871>