SHA256
10
0
forked from pool/lua-lua-ev

Fix the patch

This commit is contained in:
2025-10-10 15:47:37 +02:00
parent f4780f0b46
commit d1da10a411

View File

@@ -1,17 +1,16 @@
--- ---
CMakeLists.txt | 11 ++++++---- CMakeLists.txt | 11 ++++++----
Makefile | 17 +++++++++++++++
cmake/Modules/FindLua5X.cmake | 46 ------------------------------------------ cmake/Modules/FindLua5X.cmake | 46 ------------------------------------------
lua_ev.c | 4 +-- lua_ev.c | 4 +--
lua_ev.h | 8 +++---- lua_ev.h | 8 +++----
obj_lua_ev.c | 4 +-- obj_lua_ev.c | 4 +--
watcher_lua_ev.c | 11 ++-------- watcher_lua_ev.c | 11 ++--------
7 files changed, 35 insertions(+), 66 deletions(-) 6 files changed, 18 insertions(+), 66 deletions(-)
Index: lua-ev-1.5/CMakeLists.txt Index: lua-ev-1.5/CMakeLists.txt
=================================================================== ===================================================================
--- lua-ev-1.5.orig/CMakeLists.txt 2019-09-30 16:09:48.000000000 +0200 --- lua-ev-1.5.orig/CMakeLists.txt 2019-09-30 16:09:48.000000000 +0200
+++ lua-ev-1.5/CMakeLists.txt 2025-10-10 15:24:03.450899214 +0200 +++ lua-ev-1.5/CMakeLists.txt 2025-10-10 15:46:35.584051149 +0200
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
# Please note that the package source code is licensed under its own # Please note that the package source code is licensed under its own
# license. # license.
@@ -53,28 +52,6 @@ Index: lua-ev-1.5/CMakeLists.txt
TARGET_LINK_LIBRARIES(cmod_ev ${LUA_LIBRARIES} ${LIBEV_LIBRARY}) TARGET_LINK_LIBRARIES(cmod_ev ${LUA_LIBRARIES} ${LIBEV_LIBRARY})
# / build ev.so # / build ev.so
Index: lua-ev-1.5/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ lua-ev-1.5/Makefile 2025-10-10 15:24:19.128836100 +0200
@@ -0,0 +1,17 @@
+all:
+ mkdir -p build && cd build/ \
+ && cmake .. \
+ '-GUnix Makefiles' \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo '-DCMAKE_C_FLAGS=-O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g' \
+ '-DCMAKE_EXE_LINKER_FLAGS=-flto=auto -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now' \
+ '-DCMAKE_MODULE_LINKER_FLAGS=-flto=auto -Wl,--as-needed' \
+ '-DCMAKE_SHARED_LINKER_FLAGS=-flto=auto -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now' \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+ && make
+
+clean:
+ rm -rf build CMakeCache.txt
Index: lua-ev-1.5/cmake/Modules/FindLua5X.cmake Index: lua-ev-1.5/cmake/Modules/FindLua5X.cmake
=================================================================== ===================================================================
--- lua-ev-1.5.orig/cmake/Modules/FindLua5X.cmake 2019-09-30 16:09:48.000000000 +0200 --- lua-ev-1.5.orig/cmake/Modules/FindLua5X.cmake 2019-09-30 16:09:48.000000000 +0200
@@ -129,7 +106,7 @@ Index: lua-ev-1.5/cmake/Modules/FindLua5X.cmake
Index: lua-ev-1.5/lua_ev.c Index: lua-ev-1.5/lua_ev.c
=================================================================== ===================================================================
--- lua-ev-1.5.orig/lua_ev.c 2019-09-30 16:09:48.000000000 +0200 --- lua-ev-1.5.orig/lua_ev.c 2019-09-30 16:09:48.000000000 +0200
+++ lua-ev-1.5/lua_ev.c 2025-10-10 15:23:14.201097477 +0200 +++ lua-ev-1.5/lua_ev.c 2025-10-10 15:46:35.584453160 +0200
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
* *
* [+2, -0, -] * [+2, -0, -]
@@ -151,7 +128,7 @@ Index: lua-ev-1.5/lua_ev.c
Index: lua-ev-1.5/lua_ev.h Index: lua-ev-1.5/lua_ev.h
=================================================================== ===================================================================
--- lua-ev-1.5.orig/lua_ev.h 2019-09-30 16:09:48.000000000 +0200 --- lua-ev-1.5.orig/lua_ev.h 2019-09-30 16:09:48.000000000 +0200
+++ lua-ev-1.5/lua_ev.h 2025-10-10 15:23:14.201097477 +0200 +++ lua-ev-1.5/lua_ev.h 2025-10-10 15:46:35.584664362 +0200
@@ -100,8 +100,8 @@ @@ -100,8 +100,8 @@
/** /**
* Generic functions: * Generic functions:
@@ -178,7 +155,7 @@ Index: lua-ev-1.5/lua_ev.h
Index: lua-ev-1.5/obj_lua_ev.c Index: lua-ev-1.5/obj_lua_ev.c
=================================================================== ===================================================================
--- lua-ev-1.5.orig/obj_lua_ev.c 2019-09-30 16:09:48.000000000 +0200 --- lua-ev-1.5.orig/obj_lua_ev.c 2019-09-30 16:09:48.000000000 +0200
+++ lua-ev-1.5/obj_lua_ev.c 2025-10-10 15:23:14.201097477 +0200 +++ lua-ev-1.5/obj_lua_ev.c 2025-10-10 15:46:35.584873748 +0200
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
* *
* [-0, +1, ?] * [-0, +1, ?]
@@ -200,7 +177,7 @@ Index: lua-ev-1.5/obj_lua_ev.c
Index: lua-ev-1.5/watcher_lua_ev.c Index: lua-ev-1.5/watcher_lua_ev.c
=================================================================== ===================================================================
--- lua-ev-1.5.orig/watcher_lua_ev.c 2019-09-30 16:09:48.000000000 +0200 --- lua-ev-1.5.orig/watcher_lua_ev.c 2019-09-30 16:09:48.000000000 +0200
+++ lua-ev-1.5/watcher_lua_ev.c 2025-10-10 15:23:14.201097477 +0200 +++ lua-ev-1.5/watcher_lua_ev.c 2025-10-10 15:46:35.585063648 +0200
@@ -132,14 +132,9 @@ @@ -132,14 +132,9 @@
static void watcher_cb(struct ev_loop *loop, void *watcher, int revents) { static void watcher_cb(struct ev_loop *loop, void *watcher, int revents) {
lua_State* L = ev_userdata(loop); lua_State* L = ev_userdata(loop);