rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove redundant $@ in mingw_cmake and mingw_meson.

Browse Source 
$@ is not used by the RPM macro _in RPM_ since it is executed as a line
by itself, not a script or function.

There's already a $@ in the mingw-scripts.sh file, so when expanded from
the macro, the script contains two $@, sending redundant arguments to
cmake and meson.
This commit is contained in:
Elliott Sales de Andrade 2018-11-23 00:40:09 -05:00
parent 7b85d868c9
commit ed40f14dd0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.mingw32
View File

@ -137,7 +137,7 @@
-DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW32_CMAKE_ARGS} \\\ ${MINGW32_CMAKE_ARGS} \\\
"$@" $__mingw32_topdir $__mingw32_topdir
%mingw32_cmake \ %mingw32_cmake \
MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \ MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \
@ -173,7 +173,7 @@
--infodir %{mingw32_infodir} \\\ --infodir %{mingw32_infodir} \\\
${MINGW_MESON_ARGS} \\\ ${MINGW_MESON_ARGS} \\\
${MINGW32_MESON_ARGS} \\\ ${MINGW32_MESON_ARGS} \\\
"$@" $__mingw32_topdir $__mingw32_topdir
%mingw32_description This is the cross-compiled version of this library / tool.\ %mingw32_description This is the cross-compiled version of this library / tool.\
You should only install this package if you want to cross-compile programs for \ You should only install this package if you want to cross-compile programs for \

4
macros.mingw64
View File

@ -137,7 +137,7 @@
-DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW64_CMAKE_ARGS} \\\ ${MINGW64_CMAKE_ARGS} \\\
"$@" $__mingw64_topdir $__mingw64_topdir
%mingw64_cmake \ %mingw64_cmake \
MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \ MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \
@ -173,7 +173,7 @@
--infodir %{mingw64_infodir} \\\ --infodir %{mingw64_infodir} \\\
${MINGW_MESON_ARGS} \\\ ${MINGW_MESON_ARGS} \\\
${MINGW64_MESON_ARGS} \\\ ${MINGW64_MESON_ARGS} \\\
"$@" $__mingw64_topdir $__mingw64_topdir
%mingw64_description This is the cross-compiled version of this library / tool.\ %mingw64_description This is the cross-compiled version of this library / tool.\
You should only install this package if you want to cross-compile programs for \ You should only install this package if you want to cross-compile programs for \

7
mingw-filesystem.spec
View File

@ -6,8 +6,8 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem Name: mingw-filesystem
Version: 104 Version: 105
Release: 3%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
License: GPLv2+ License: GPLv2+
@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Tue Feb 05 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 105-1
- Remove redundant $@ in mingw_cmake and mingw_meson, breaking wrapper scripts
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild