#3 Adjust for cmake 3.23.0, where -S (passed by %cmake) overrides the positional argument
Merged 2 years ago by salimma. Opened 2 years ago by salimma.
rpms/ salimma/lua-luv fix-for-rawhide-cmake  into  rawhide

file modified
+18 -6
@@ -44,7 +44,7 @@ 

  

  Name:           lua-luv

  Version:        %{real_version}.%{extra_version}

- Release:        2%{?dist}

+ Release:        3%{?dist}

  

  License:        ASL 2.0

  Summary:        Bare libuv bindings for lua
@@ -132,9 +132,7 @@ 

  %prep

  %setup -n luv-%{real_version}-%{extra_version}

  

- %ifarch aarch64 s390x

  %patch100 -p1

- %endif

  

  # Remove bundled dependencies

  rm -rf deps
@@ -147,7 +145,7 @@ 

  mkdir %{lua_builddir}

  

  pushd %{lua_builddir}

- %cmake .. \

+ %cmake -S .. \

      -DWITH_SHARED_LIBUV=ON \

      -DBUILD_MODULE=ON \

      -DBUILD_SHARED_LIBS=ON \
@@ -163,7 +161,7 @@ 

  mkdir %{lua_51_builddir}

  

  pushd %{lua_51_builddir}

- %cmake .. \

+ %cmake -S .. \

      -DWITH_SHARED_LIBUV=ON \

      -DBUILD_MODULE=ON \

      -DBUILD_SHARED_LIBS=ON \
@@ -182,7 +180,7 @@ 

  mkdir %{luajit_builddir}

  

  pushd %{luajit_builddir}

- %cmake .. \

+ %cmake -S .. \

      -DWITH_SHARED_LIBUV=ON \

      -DBUILD_MODULE=ON \

      -DBUILD_SHARED_LIBS=ON \
@@ -241,6 +239,15 @@ 

  %if %{with luajit}

  # luajit

  ln -sf %{luajit_builddir}/%{_vpath_builddir}/luv.so luv.so

+ %if 0%{?el8}

+ %ifarch aarch64

+ # luajit test consistently failing with:

+ # ok 105 udp - udp recvmmsg

+ # PANIC: unprotected error in call to Lua API (bad light userdata pointer)

+ # /var/tmp/rpm-tmp.8I3N1v: line 45:   553 Aborted                 (core dumped) luajit tests/run.lua

+ rm tests/test-work.lua

+ %endif

+ %endif

  luajit tests/run.lua

  rm luv.so

  # /with luajit
@@ -292,6 +299,11 @@ 

  %endif

  

  %changelog

+ * Fri Mar 11 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.42.0.1-3

+ - Adjust for cmake 3.23.0, where -S (passed by %%cmake) overrides the positional argument

+ - Disable UDP multicast tests unconditionally, seems flaky

+ - Disable luajit threadpool tests on EPEL 8 aarch64

+ 

  * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.42.0.1-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

  

We build lua-luv several times against different Lua runtimes, and as such cmake is invoked from different directories to ensure the builds are separate from each other. This used to work but it seems that with F37's cmake 3.23.0, since %cmake also passes -S ., that overrides the positional argument we provide unless we also use -S so it overrides the previous -S . default.

Tested and this also works in the older cmake in EPEL 8 (where the build fails differently because a test is failing, which I'm investigating).

Signed-off-by: Michel Alexandre Salim salimma@fedoraproject.org

1 new commit added

  • Disable UDP multicast tests unconditionally
2 years ago

1 new commit added

  • Disable luajit threadpool tests on EPEL 8 aarch64
2 years ago

(the spec now builds fine on everything from Fedora rawhide down to EPEL 8 consistently, I'll merge this to EPEL 8 (and also to EPEL 9 once some dependencies are branched) once this is OK-ed for Rawhide, or on Tuesday to allow for feedback)

Looks fine for me. Feel free to merge and also apply it to f36 please.

Thanks!

Pull-Request has been merged by salimma

2 years ago
Metadata