Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mingw32-cross-cmake for
openSUSE:Factory checked in at 2023-06-14 16:29:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mingw32-cross-cmake (Old)
and /work/SRC/openSUSE:Factory/.mingw32-cross-cmake.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mingw32-cross-cmake"
Wed Jun 14 16:29:56 2023 rev:2 rq:1092983 version:1.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mingw32-cross-cmake/mingw32-cross-cmake.changes
2023-03-30 22:51:02.964504917 +0200
+++
/work/SRC/openSUSE:Factory/.mingw32-cross-cmake.new.15902/mingw32-cross-cmake.changes
2023-06-14 16:31:23.679226206 +0200
@@ -1,0 +2,8 @@
+Mon Jun 12 10:00:25 UTC 2023 - Ralf Habacker <[email protected]>
+
+- Update to version 1.1.0
+ * Add mingw32-cmake.lua as placeholder for future Lua functions
+ * %_mingw32_cmake: enabled support for selecting a custom build and
+ source directory by using the cmake options -S/-B (boo#1212238)
+
+-------------------------------------------------------------------
New:
----
mingw32-cmake.lua
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mingw32-cross-cmake.spec ++++++
--- /var/tmp/diff_new_pack.2OZt0z/_old 2023-06-14 16:31:24.415230731 +0200
+++ /var/tmp/diff_new_pack.2OZt0z/_new 2023-06-14 16:31:24.419230755 +0200
@@ -15,8 +15,9 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: mingw32-cross-cmake
-Version: 1.0.0
+Version: 1.1.0
Release: 0
Summary: Cross build support for CMake
License: BSD-3-Clause
@@ -25,6 +26,7 @@
Source1: macros.mingw32-cmake
Source2: mingw32-cmake.prov
Source3: mingw32_cmake.attr
+Source4: mingw32-cmake.lua
BuildRequires: mingw32-filesystem
Requires: cmake >= 3.10
Requires: mingw32-filesystem
@@ -59,8 +61,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}/mingw32-cmake
%{_rpmconfigdir}/mingw32-cmake.prov
++++++ macros.mingw32-cmake ++++++
--- /var/tmp/diff_new_pack.2OZt0z/_old 2023-06-14 16:31:24.479231124 +0200
+++ /var/tmp/diff_new_pack.2OZt0z/_new 2023-06-14 16:31:24.483231148 +0200
@@ -5,10 +5,40 @@
#
%__cmake_generator %{lua: if rpm.expand("%__builder") == rpm.expand("%__make")
then print("-G'Unix Makefiles'") else print("-GNinja") end}
-%_mingw32_cmake %{_mingw32_env} ; \
- mkdir -p %__builddir \
- cd %__builddir \
- %__cmake $OLDPWD/%__sourcedir \\\
+#
+# macro for configuring a cross build with cmake
+#
+# To override the builtin source and build path defaults
+#
+# source path: $(pwd)
+# build path: $(pwd)/build
+#
+# add the following to the macro parameter list
+#
+# -S <sourcedir>
+# -B <builddir>
+#
+# for other options see cmake -h
+#
+%_mingw32_cmake(A:B:C:D:EG:L::NP:S:T:U:W:-:hH:u:v:) %{_mingw32_env} ; \
+ %{-B:bdir=%{-B*}} \
+ %{-S:sdir=%{-S*}} \
+ opts="" \
+ skipnext=0 \
+ for i in "$@"; do \
+ if test "$i" == "-S" || test "$i" == "-B"; then \
+ skipnext=1 \
+ elif test "$skipnext" -ne 0; then \
+ skipnext=0 \
+ else \
+ opts="$opts $i" \
+ fi \
+ done \
+ %{!-B:bdir=$(pwd)/%__builddir} \
+ mkdir -p $bdir \
+ cd $bdir \
+ %{!-S:sdir=$OLDPWD/%__sourcedir} \
+ %__cmake -S $sdir -B $bdir $opts \\\
%__cmake_generator \\\
-DCMAKE_SYSTEM_NAME="Windows" \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
@@ -45,5 +75,4 @@
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %**
\
cd $OLDPWD
-(No newline at EOF)
++++++ mingw32-cmake.lua ++++++
-- placeholder for future addings
--
-- To use functions from this file in a rpm macro you can use
--
-- rpm --define '%foo %{lua: require "mingw32-cmake"; myfunc() }' --eval
'%foo'
--
