PR#11: Add pkgconfig provides - rpms/mingw-filesystem

rpms / mingw-filesystem

#11 Add pkgconfig provides

Merged 9 months ago by smani. Opened a year ago by orion.

rpms/ orion/mingw-filesystem pkgconfig into rawhide

Add pkgconfig provides for installed pkgconfig files

Orion Poplawski • 9 months ago

df0ee64

mingw-filesystem.spec

file modified

+5 -2

		`@@ -9,8 +9,8 @@`
		`%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] \|\| d=%{_sysconfdir}/rpm; echo $d)`

		`Name: mingw-filesystem`
		`- Version: 147`
		`- Release: 3%{?dist}`
		`+ Version: 148`
		`+ Release: 1%{?dist}`
		`Summary: MinGW cross compiler base filesystem and environment`

		`License: GPL-2.0-or-later`
		`@@ -378,6 +378,9 @@`
		`%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt`

		`%changelog`
		`+ * Wed Sep 13 2023 Orion Poplawski <orion@nwra.com> - 148-1`
		`+ - Add pkgconfig provides`
		`+`
		`* Mon Sep 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 147-3`
		`- Add dependency on cmake-rpm-macros`

mingw.prov

file modified

+10

		`@@ -21,4 +21,14 @@`
		`done`
		`done`

		`+ pcs=$(echo $filelist \| tr '[:blank:]' '\n' \| grep '\.pc$')`
		`+`
		`+ for f in $pcs; do`
		+ basename=`basename $f .pc \| tr '[:upper:]' '[:lower:]'`
		`+ for target in $targets; do`
		+ host_triplet=`rpm --eval "%{${target}_target}"`
		`+ [[ $f =~ .$host_triplet. ]] && echo "${target}-pkgconfig($basename)"`
		`+ done`
		`+ done`
		`+`
		`exit 0`

no initial comment

rjones commented a year ago

Could the commit message have some sort of summary of what exactly this change does with some examples?

rebased onto 97d9fae

a year ago

orion commented a year ago

How's this update?

rjones commented a year ago

That's much clearer, thanks. So if we compare this to existing non-mingw packages, then at the moment:

$ rpm -q --provides -f /usr/lib64/pkgconfig/zlib.pc
pkgconfig(zlib) = 1.2.12
zlib-devel = 1.2.12-5.fc37
zlib-devel(x86-64) = 1.2.12-5.fc37

$ rpm -q --provides -f /usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/zlib.pc
mingw64(zlib1.dll)
mingw64-zlib = 1.2.12-2.fc37

It does seem that the mingw package is missing some sort of pkgconfig()-style dependency, and I guess whether we call it pkgconfig(mingw-zlib) or mingw-pkgconfig(zlib) is a matter of preference (I have no particular preference here).

Therefore I think this change is worthwhile but let's see what Sandro Mani thinks.

rjones commented a year ago

Or pkgconfig(mingw64-zlib) or mingw64-pkgconfig(zlib) as in this proposal ... Again, I have no idea which is best, so no preference.