diff options
| -rw-r--r-- | cygwin-filesystem.spec | 21 | ||||
| -rwxr-xr-x | cygwin.req | 4 | ||||
| -rw-r--r-- | macros.cygwin | 2 |
3 files changed, 21 insertions, 6 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index d26d4e8..c58cef9 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -7,7 +7,7 @@ Name: cygwin-filesystem Version: 128 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Cygwin cross compiler base filesystem and environment License: GPLv2+ @@ -142,10 +142,12 @@ for i in cygwin32-configure cygwin32-cmake cygwin32-make cygwin32-meson cygwin32 cygwin64-configure cygwin64-cmake cygwin64-make cygwin64-meson cygwin64-pkg-config ; do ln -s %{_libexecdir}/cygwin-scripts $i done +%if 0%{?fedora} || 0%{?rhel} >= 9 for i in i686-pc-cygwin-pkg-config \ x86_64-pc-cygwin-pkg-config ; do ln -s %{_bindir}/pkgconf $i done +%endif popd mkdir -p %{buildroot}%{_sysconfdir}/profile.d @@ -320,7 +322,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-pc-cygwin-pkg-con %{_bindir}/cygwin32-make %{_bindir}/cygwin32-meson %{_bindir}/cygwin32-pkg-config +%if 0%{?fedora} || 0%{?rhel} >= 9 %{_bindir}/i686-pc-cygwin-pkg-config +%endif %{_prefix}/i686-pc-cygwin %{_rpmconfigdir}/fileattrs/cygwin32.attr %{_datadir}/cygwin/toolchain-cygwin32.cmake @@ -341,7 +345,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-pc-cygwin-pkg-con %{_bindir}/cygwin64-make %{_bindir}/cygwin64-meson %{_bindir}/cygwin64-pkg-config +%if 0%{?fedora} || 0%{?rhel} >= 9 %{_bindir}/x86_64-pc-cygwin-pkg-config +%endif %{_prefix}/x86_64-pc-cygwin %{_rpmconfigdir}/fileattrs/cygwin64.attr %{_datadir}/cygwin/toolchain-cygwin64.cmake @@ -355,6 +361,15 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-pc-cygwin-pkg-con %changelog +* Sun Jan 30 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 128-4 +- Fix cygwin-pkg-config conflict on RHEL 7/8 + +* Mon Jan 10 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 128-3 +- Fix passing of arguments to cygwin_autoreconf + +* Mon Jan 10 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 128-2 +- s/crt/w32api-runtime/g + * Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 128-1 - Add Boost_ARCHITECTURE to cmake toolchain file @@ -590,10 +605,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-pc-cygwin-pkg-con * Sat Mar 17 2012 Kalev Lember <kalevlember@gmail.com> - 95-8 - Generate the list of cygwin32(...) and cygwin64(...) DLL name provides from - cygwin-crt import libraries + cygwin-w32api-runtime import libraries * Sat Mar 17 2012 Kalev Lember <kalevlember@gmail.com> - 95-7 -- Define cygwin_build_32bit/win64 in system macros, so that each +- Define cygwin_build_32bit/64bit in system macros, so that each individual package wouldn't have to * Fri Mar 16 2012 Kalev Lember <kalevlember@gmail.com> - 95-6 @@ -32,10 +32,10 @@ for target in $targets; do fi done - # Add a dependency on filesystem and crt if necessary + # Add a dependency on filesystem and runtime if necessary if [ $dll_found = true ]; then echo "${target}-filesystem >= 95" - echo "${target}-crt" + echo "${target}-w32api-runtime" fi pkgconfig_files_found=false diff --git a/macros.cygwin b/macros.cygwin index 14ea80d..9173660 100644 --- a/macros.cygwin +++ b/macros.cygwin @@ -48,7 +48,7 @@ run_cygwin_autoreconf() \ eval gettext_`grep '^version=' %{cygwin32_bindir}/autopoint`; \ AUTOPOINT="%{cygwin32_bindir}/autopoint -V $gettext_version" ; export AUTOPOINT; \ fi; \ - autoreconf -fiv \ + autoreconf -fiv "$@" \ } \ run_cygwin_autoreconf |