From 24d0cabfbc88500e9e18c8012c279c733450597b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 17 Jun 2021 09:06:52 +0100 Subject: [PATCH] Manually merge fedora/rawhide resolves: rhbz#1972872 --- macros.mingw32 | 4 +- macros.mingw64 | 4 +- mingw-filesystem.spec | 207 +++++++++++++++++++++--------------- pkgconf-personality-mingw32 | 6 ++ pkgconf-personality-mingw64 | 6 ++ 5 files changed, 142 insertions(+), 85 deletions(-) create mode 100644 pkgconf-personality-mingw32 create mode 100644 pkgconf-personality-mingw64 diff --git a/macros.mingw32 b/macros.mingw32 index 49efc47..3c393e1 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -153,7 +153,9 @@ %mingw32_meson %{mingw32_env} ; \ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\ - export CFLAGS="%{mingw32_cflags}" CXXFLAGS="%{mingw32_cflags}" LDFLAGS="%{mingw32_ldflags}"; \\\ + CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\ + CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \\\ + LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \\\ if test -f meson.build; then __mingw32_topdir=.; \\\ elif test -f ../meson.build; then __mingw32_topdir=..; \\\ else __mingw32_topdir=""; fi; \\\ diff --git a/macros.mingw64 b/macros.mingw64 index 8183fb2..cb37add 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -153,7 +153,9 @@ %mingw64_meson %{mingw64_env} ; \ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\ - export CFLAGS="%{mingw64_cflags}" CXXFLAGS="%{mingw64_cflags}" LDFLAGS="%{mingw64_ldflags}"; \\\ + CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\ + CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \\\ + LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \\\ if test -f meson.build; then __mingw64_topdir=.; \\\ elif test -f ../meson.build; then __mingw64_topdir=..; \\\ else __mingw64_topdir=""; fi; \\\ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 4ba12fb..742bc71 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,8 +6,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 117 -Release: 2%{?dist} +Version: 119 +Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -37,14 +37,17 @@ Source16: standard-dlls-mingw32 Source17: standard-dlls-mingw64 Source18: toolchain-mingw32.meson Source19: toolchain-mingw64.meson +Source20: pkgconf-personality-mingw32 +Source21: pkgconf-personality-mingw64 # Taken from the Fedora filesystem package Source101: https://fedorahosted.org/filesystem/browser/lang-exceptions Source102: iso_639.sed Source103: iso_3166.sed -BuildRequires: make +BuildRequires: make BuildRequires: iso-codes +BuildRequires: pkgconf %description @@ -65,6 +68,8 @@ Obsoletes: cross-filesystem < 67-2 Obsoletes: cross-filesystem-scripts < 67-2 Obsoletes: mingw-filesystem < 75-2 Obsoletes: mingw-filesystem-scripts < 75-2 +# For using pkgconf with MinGW +Requires: pkgconf %description base This package contains the base filesystem layout, RPM macros and @@ -78,6 +83,10 @@ This environment is maintained by the Fedora MinGW SIG at: %package -n mingw32-filesystem Summary: MinGW cross compiler base filesystem and environment for the win32 target Requires: %{name}-base = %{version}-%{release} +# Replace mingw32-pkg-config +Conflicts: mingw32-pkg-config < 0.28-17 +Obsoletes: mingw32-pkg-config < 0.28-17 +Provides: mingw32-pkg-config = 0.28-17 # Note about 'Provides: mingw32(foo.dll)' # ------------------------------------------------------------ @@ -108,6 +117,10 @@ This environment is maintained by the Fedora MinGW SIG at: %package -n mingw64-filesystem Summary: MinGW cross compiler base filesystem and environment for the win64 target Requires: %{name}-base = %{version}-%{release} +# Replace mingw64-pkg-config +Conflicts: mingw64-pkg-config < 0.28-17 +Obsoletes: mingw64-pkg-config < 0.28-17 +Provides: mingw64-pkg-config = 0.28-17 Provides: %(sed "s/\(.*\)/mingw64(\1) /g" %{SOURCE17} | tr "\n" " ") Provides: mingw64(mscoree.dll) @@ -131,60 +144,64 @@ cp %{SOURCE0} COPYING %install -mkdir -p $RPM_BUILD_ROOT +mkdir -p %{buildroot} -mkdir -p $RPM_BUILD_ROOT%{_libexecdir} -install -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_libexecdir}/mingw-scripts +mkdir -p %{buildroot}%{_libexecdir} +install -m 755 %{SOURCE9} %{buildroot}%{_libexecdir}/mingw-scripts -mkdir -p $RPM_BUILD_ROOT%{_bindir} -pushd $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_bindir} +pushd %{buildroot}%{_bindir} for i in mingw32-configure mingw32-cmake mingw32-make mingw32-meson mingw32-pkg-config \ mingw64-configure mingw64-cmake mingw64-make mingw64-meson mingw64-pkg-config ; do ln -s %{_libexecdir}/mingw-scripts $i done +for i in i686-w64-mingw32-pkg-config \ + x86_64-w64-mingw32-pkg-config ; do + ln -s %{_bindir}/pkgconf $i +done popd -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ +install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/profile.d/ -mkdir -p $RPM_BUILD_ROOT%{macrosdir} -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw32 -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{macrosdir}/macros.mingw64 +mkdir -p %{buildroot}%{macrosdir} +install -m 644 %{SOURCE1} %{buildroot}%{macrosdir}/macros.mingw +install -m 644 %{SOURCE2} %{buildroot}%{macrosdir}/macros.mingw32 +install -m 644 %{SOURCE3} %{buildroot}%{macrosdir}/macros.mingw64 -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/ +mkdir -p %{buildroot}%{_sysconfdir}/rpmlint +install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/rpmlint/ # Create the folders required for gcc and binutils -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32 -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/bin -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/lib -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32 -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/bin -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/lib +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32 +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/bin +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/lib +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32 +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/bin +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/lib # The MinGW system root which will contain Windows native binaries # and Windows-specific header files, pkgconfig, etc. -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/bin -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/etc -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/include -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/include/sys -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/cmake -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/sbin +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/bin +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/etc +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/include +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/include/sys +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/lib/cmake +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/sbin -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/bin -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/etc -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/bin +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/etc +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/include +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/lib/cmake +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin # We don't normally package manual pages and info files, except # where those are not supplied by a Fedora native package. So we @@ -194,36 +211,36 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/sbin # /usr/x86_64-pc-mingw32/sys-root/man and # /usr/x86_64-pc-mingw32/sys-root/doc # but those are both packaging bugs. -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/doc -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/info -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n} -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/aclocal -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/themes -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/cmake -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/xml +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/doc +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/info +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n} +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/aclocal +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/themes +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/cmake +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/pkgconfig +mkdir -p %{buildroot}%{_prefix}/i686-w64-mingw32/sys-root/mingw/share/xml -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/doc -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/info -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n} -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/aclocal -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/themes -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/cmake -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig -mkdir -p $RPM_BUILD_ROOT%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/doc +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/info +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n} +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/aclocal +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/themes +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/cmake +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig +mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml # Own folders for all locales # Snippet taken from the Fedora filesystem package -sed -n -f %{SOURCE102} /usr/share/xml/iso-codes/iso_639.xml > $RPM_BUILD_ROOT/iso_639.tab -sed -n -f %{SOURCE103} /usr/share/xml/iso-codes/iso_3166.xml > $RPM_BUILD_ROOT/iso_3166.tab +sed -n -f %{SOURCE102} /usr/share/xml/iso-codes/iso_639.xml > %{buildroot}/iso_639.tab +sed -n -f %{SOURCE103} /usr/share/xml/iso-codes/iso_3166.xml > %{buildroot}/iso_3166.tab -grep -v "^$" $RPM_BUILD_ROOT/iso_639.tab | grep -v "^#" | while read a b c d ; do +grep -v "^$" %{buildroot}/iso_639.tab | grep -v "^#" | while read a b c d ; do [[ "$d" =~ "^Reserved" ]] && continue [[ "$d" =~ "^No linguistic" ]] && continue @@ -246,39 +263,48 @@ cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do # If the locality is not official, skip it if [ -n "$locality" ]; then - grep -q "^$locality" $RPM_BUILD_ROOT/iso_3166.tab || continue + grep -q "^$locality" %{buildroot}/iso_3166.tab || continue fi # If the locale is not official and not special, skip it if [ -z "$special" ]; then - egrep -q "[[:space:]]${locale%%_*}[[:space:]]" $RPM_BUILD_ROOT/iso_639.tab || continue + egrep -q "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue fi echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32 echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw64 done -rm -f $RPM_BUILD_ROOT/iso_639.tab -rm -f $RPM_BUILD_ROOT/iso_3166.tab +rm -f %{buildroot}/iso_639.tab +rm -f %{buildroot}/iso_3166.tab cat filelist_mingw32 filelist_mingw64 | grep "locale" | while read a b ; do mkdir -p -m 755 %{buildroot}/$b/LC_MESSAGES done # NB. NOT _libdir -mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm -install -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir} -install -m 0755 %{SOURCE7} $RPM_BUILD_ROOT%{_rpmconfigdir} -install -m 0755 %{SOURCE8} $RPM_BUILD_ROOT%{_rpmconfigdir} -install -m 0755 %{SOURCE13} $RPM_BUILD_ROOT%{_rpmconfigdir} +mkdir -p %{buildroot}/usr/lib/rpm +install -m 0755 %{SOURCE6} %{buildroot}%{_rpmconfigdir} +install -m 0755 %{SOURCE7} %{buildroot}%{_rpmconfigdir} +install -m 0755 %{SOURCE8} %{buildroot}%{_rpmconfigdir} +install -m 0755 %{SOURCE13} %{buildroot}%{_rpmconfigdir} -mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs -install -m 0644 %{SOURCE14} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/ -install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/ +mkdir -p %{buildroot}/usr/lib/rpm/fileattrs +install -m 0644 %{SOURCE14} %{buildroot}%{_rpmconfigdir}/fileattrs/ +install -m 0644 %{SOURCE15} %{buildroot}%{_rpmconfigdir}/fileattrs/ -mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw -install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mingw/ -install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/ -install -m 0644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/mingw/ -install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ +mkdir -p %{buildroot}%{_datadir}/mingw +install -m 0644 %{SOURCE11} %{buildroot}%{_datadir}/mingw/ +install -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/mingw/ +install -m 0644 %{SOURCE18} %{buildroot}%{_datadir}/mingw/ +install -m 0644 %{SOURCE19} %{buildroot}%{_datadir}/mingw/ + +mkdir -p %{buildroot}%{pkgconfig_personalitydir} +install -m 0644 %{SOURCE20} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-mingw32.personality +install -m 0644 %{SOURCE21} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality + +# Link mingw-pkg-config man pages to pkgconf(1) +mkdir -p %{buildroot}%{_mandir}/man1/ +echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/i686-w64-mingw32-pkg-config.1 +echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1 %files base @@ -298,10 +324,15 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %{_bindir}/mingw32-make %{_bindir}/mingw32-meson %{_bindir}/mingw32-pkg-config +%{_bindir}/i686-w64-mingw32-pkg-config +%{_mandir}/man1/i686-w64-mingw32-pkg-config.1* %{_prefix}/i686-w64-mingw32 %{_rpmconfigdir}/fileattrs/mingw32.attr %{_datadir}/mingw/toolchain-mingw32.cmake %{_datadir}/mingw/toolchain-mingw32.meson +%{pkgconfig_personalitydir}/i686-w64-mingw32.personality +%{_mandir}/man1/i686-w64-mingw32-pkg-config.1* + %files -n mingw64-filesystem %{macrosdir}/macros.mingw64 @@ -311,13 +342,23 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %{_bindir}/mingw64-make %{_bindir}/mingw64-meson %{_bindir}/mingw64-pkg-config +%{_bindir}/x86_64-w64-mingw32-pkg-config +%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1* %{_prefix}/x86_64-w64-mingw32 %{_rpmconfigdir}/fileattrs/mingw64.attr %{_datadir}/mingw/toolchain-mingw64.cmake %{_datadir}/mingw/toolchain-mingw64.meson +%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality +%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1* %changelog +* Sat Jun 12 2021 Neal Gompa - 119-1 +- Use pkgconf for pkgconfig + +* Mon Jun 07 2021 Sandro Mani - 118-1 +- Allow overriding CFLAGS/CXXFLAGS/LDFLAGS for %%mingw_meson + * Fri Apr 16 2021 Mohan Boddu - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/pkgconf-personality-mingw32 b/pkgconf-personality-mingw32 new file mode 100644 index 0000000..dcf7848 --- /dev/null +++ b/pkgconf-personality-mingw32 @@ -0,0 +1,6 @@ +# MinGW 32-bit x86 Windows target +Triplet: i686-w64-mingw32 +SysrootDir: /usr/i686-w64-mingw32/sys-root/mingw +DefaultSearchPaths: /usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig +SystemIncludePaths: /usr/i686-w64-mingw32/sys-root/mingw/include +SystemLibraryPaths: /usr/i686-w64-mingw32/sys-root/mingw/lib diff --git a/pkgconf-personality-mingw64 b/pkgconf-personality-mingw64 new file mode 100644 index 0000000..4cca871 --- /dev/null +++ b/pkgconf-personality-mingw64 @@ -0,0 +1,6 @@ +# MinGW 64-bit x86 Windows target +Triplet: x86_64-w64-mingw32 +SysrootDir: /usr/x86_64-w64-mingw32/sys-root/mingw +DefaultSearchPaths: /usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig +SystemIncludePaths: /usr/x86_64-w64-mingw32/sys-root/mingw/include +SystemLibraryPaths: /usr/x86_64-w64-mingw32/sys-root/mingw/lib