[packages/taskwarrior] use native system installed bindgen

atler atler at pld-linux.org
Mon Jun 2 14:47:03 CEST 2025


commit a967f5caa65904c7029ca5e2ce42585174541cbd
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jun 2 14:02:16 2025 +0200

    use native system installed bindgen

 taskwarrior.spec | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/taskwarrior.spec b/taskwarrior.spec
index 8e1e08b..92d6126 100644
--- a/taskwarrior.spec
+++ b/taskwarrior.spec
@@ -17,11 +17,7 @@ Patch0:		system-sqlite3.patch
 URL:		http://taskwarrior.org/
 BuildRequires:	cargo
 BuildRequires:	clang
-%ifnarch x32
 BuildRequires:	clang-devel
-%else
-BuildRequires:	clang-devel(x86-64)
-%endif
 BuildRequires:	cmake >= 3.22
 BuildRequires:	libstdc++-devel >= 6:5
 BuildRequires:	libuuid-devel
@@ -29,6 +25,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 2.004
 BuildRequires:	rust
+BuildRequires:	rust-bindgen
 BuildRequires:	sqlite3-devel
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -133,11 +130,7 @@ install -d .cxxbridge
 %cargo_install -f --locked --root .cxxbridge cxxbridge-cmd
 export PATH=$PATH:$(pwd)/.cxxbridge/bin
 export BINDGEN_EXTRA_CLANG_ARGS="%{rpmcflags} %{rpmcppflags}"
-%ifnarch x32
 export LIBCLANG_PATH="%{_libdir}"
-%else
-export LIBCLANG_PATH=/usr/lib64
-%endif
 export LIBSQLITE3_SYS_USE_PKG_CONFIG=true
 %cmake -B build \
 	-DRust_CARGO_TARGET="%rust_target" \
@@ -158,11 +151,7 @@ export CPPFLAGS="%{rpmcppflags}"
 export LDFLAGS="%{rpmldflags}"
 export RUSTFLAGS="${RUSTFLAGS:-%{rpmrustflags}}"
 export BINDGEN_EXTRA_CLANG_ARGS="%{rpmcflags} %{rpmcppflags}"
-%ifnarch x32
 export LIBCLANG_PATH="%{_libdir}"
-%else
-export LIBCLANG_PATH=/usr/lib64
-%endif
 export LIBSQLITE3_SYS_USE_PKG_CONFIG=true
 %{__make} install -C build \
 	DESTDIR=$RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/taskwarrior.git/commitdiff/a967f5caa65904c7029ca5e2ce42585174541cbd



More information about the pld-cvs-commit mailing list