Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw64-cross-cmake for openSUSE:Factory checked in at 2023-06-21 22:38:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw64-cross-cmake (Old) and /work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mingw64-cross-cmake" Wed Jun 21 22:38:35 2023 rev:2 rq:1093534 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw64-cross-cmake/mingw64-cross-cmake.changes 2023-04-04 21:26:26.915246247 +0200 +++ /work/SRC/openSUSE:Factory/.mingw64-cross-cmake.new.15902/mingw64-cross-cmake.changes 2023-06-21 22:39:23.362201526 +0200 @@ -1,0 +2,18 @@ +Wed Jun 14 14:39:59 UTC 2023 - Ralf Habacker <ralf.habac...@freenet.de> + +- Update to version 1.1.1 + * The use of the parametric rpm macro was abandoned because it has + too many limitations. With rpm >= 4.17 it would be possible to + disable option processing (see + https://rpm-software-management.github.io/rpm/manual/macros.html), + but this is not possible with Leap, which uses rpm 4.14. + +------------------------------------------------------------------- +Mon Jun 12 10:00:25 UTC 2023 - Ralf Habacker <ralf.habac...@freenet.de> + +- Update to version 1.1.0 + * Add mingw64-cmake.lua as placeholder for future Lua functions + * %_mingw64_cmake: enabled support for selecting a custom build and + source directory by using the cmake options -S/-B (boo#1212238) + +------------------------------------------------------------------- New: ---- mingw64-cmake.lua ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw64-cross-cmake.spec ++++++ --- /var/tmp/diff_new_pack.yXmL8J/_old 2023-06-21 22:39:24.406207810 +0200 +++ /var/tmp/diff_new_pack.yXmL8J/_new 2023-06-21 22:39:24.414207858 +0200 @@ -16,7 +16,7 @@ # Name: mingw64-cross-cmake -Version: 1.0.0 +Version: 1.1.1 Release: 0 Summary: Cross build support for CMake License: BSD-3-Clause @@ -25,6 +25,7 @@ Source1: macros.mingw64-cmake Source2: mingw64-cmake.prov Source3: mingw64_cmake.attr +Source4: mingw64-cmake.lua BuildRequires: mingw64-filesystem Requires: cmake >= 3.10 Requires: mingw64-filesystem @@ -59,8 +60,13 @@ mkdir -p %{buildroot}%{_fileattrsdir} install -m 0644 %{SOURCE3} %{buildroot}%{_fileattrsdir} +# lua macros +mkdir -p %{buildroot}%{_rpmluadir} +install -m 0644 %{SOURCE4} %{buildroot}%{_rpmluadir} + %files %defattr(-,root,root) +%{_rpmluadir} %{_rpmmacrodir} %{_bindir}/mingw64-cmake %{_rpmconfigdir}/mingw64-cmake.prov ++++++ macros.mingw64-cmake ++++++ --- /var/tmp/diff_new_pack.yXmL8J/_old 2023-06-21 22:39:24.450208074 +0200 +++ /var/tmp/diff_new_pack.yXmL8J/_new 2023-06-21 22:39:24.454208098 +0200 @@ -5,10 +5,45 @@ # %__cmake_generator %{lua: if rpm.expand("%__builder") == rpm.expand("%__make") then print("-G'Unix Makefiles'") else print("-GNinja") end} +# +# macro for configuring a cross build with cmake +# +# To override the builtin source and build path defaults +# +# source path: $(pwd)/%__srcdir +# build path: $(pwd)/%__builddir +# +# add the following to the macro parameter list +# +# -S <sourcedir> +# -B <builddir> +# +# for other options see cmake -h +# %_mingw64_cmake %{_mingw64_env} ; \ - mkdir -p %__builddir \ - cd %__builddir \ - %__cmake $OLDPWD/%__sourcedir \\\ + opts="" \ + for i in "$@"; do \ + if test "$i" == "-S"; then \ + shift \ + sdir=$i \ + shift \ + elif test "$i" == "-B"; then \ + shift \ + bdir=$i \ + shift \ + else \ + opts="$opts $i" \ + fi \ + done \ + if test -z "$bdir"; then \ + bdir=$(pwd)/%__builddir \ + fi \ + mkdir -p $bdir \ + cd $bdir \ + if test -z "$sdir"; then \ + sdir=$OLDPWD/%__sourcedir \ + fi \ + %__cmake -S $sdir -B $bdir $opts \\\ %__cmake_generator \\\ -DCMAKE_SYSTEM_NAME="Windows" \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\ @@ -45,5 +80,4 @@ %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** \ cd $OLDPWD -(No newline at EOF) ++++++ mingw64-cmake.lua ++++++ -- placeholder for future addings -- -- To use functions from this file in a rpm macro you can use -- -- rpm --define '%foo %{lua: require "mingw64-cmake"; myfunc() }' --eval '%foo' -- (No newline at EOF)