From 9e63fb59e7b8506183172869ea44b68cdec29be5 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Fri, 4 Oct 2024 13:36:54 -0400 Subject: Tons of changes Mainly for things that came up in other projects. Signed-off-by: Andrew Opalach --- subprojects/jansson.wrap | 2 +- subprojects/libev.wrap | 2 +- subprojects/packagefiles/libev/no_extern_on_init.diff | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 subprojects/packagefiles/libev/no_extern_on_init.diff (limited to 'subprojects') diff --git a/subprojects/jansson.wrap b/subprojects/jansson.wrap index 9574739..d274513 100644 --- a/subprojects/jansson.wrap +++ b/subprojects/jansson.wrap @@ -1,5 +1,5 @@ [wrap-git] url = https://github.com/akheron/jansson.git -revision = 60097f0096f337393b42d0ad13d403294ff4e782 +revision = 61fc3d0e28e1a35410af42e329cd977095ec32d2 depth = 1 method = cmake diff --git a/subprojects/libev.wrap b/subprojects/libev.wrap index 0cde03e..02b8df5 100644 --- a/subprojects/libev.wrap +++ b/subprojects/libev.wrap @@ -6,7 +6,7 @@ source_filename = libev-4.33.tar.gz source_hash = 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea patch_directory = libev -diff_files = libev/libev_aki_sleep_no_monotonic.diff +diff_files = libev/libev_aki_sleep_no_monotonic.diff, libev/no_extern_on_init.diff [provide] dependency_names = libev diff --git a/subprojects/packagefiles/libev/no_extern_on_init.diff b/subprojects/packagefiles/libev/no_extern_on_init.diff new file mode 100644 index 0000000..0cc518b --- /dev/null +++ b/subprojects/packagefiles/libev/no_extern_on_init.diff @@ -0,0 +1,11 @@ +--- ev.c 2024-07-12 13:56:31.605067771 -0400 ++++ ev.c 2024-07-12 13:54:30.225653813 -0400 +@@ -2142,7 +2142,7 @@ + #include "ev_wrap.h" + + static struct ev_loop default_loop_struct; +- EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a definition despite extern */ ++ struct ev_loop *ev_default_loop_ptr = 0; + + #else + -- cgit v1.2.3-101-g0448