- Fix duplicate uperl in psgi plugin with wth gcc 10

OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=91

uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch

@@ -0,0 +1,38 @@
+diff --git a/plugins/psgi/psgi.h b/plugins/psgi/psgi.h
+index 92e6b588..064041a2 100644
+--- a/plugins/psgi/psgi.h
++++ b/plugins/psgi/psgi.h
+@@ -87,3 +87,5 @@ void uwsgi_perl_exec(char *);
+ 
+ void uwsgi_perl_check_auto_reload(void);
+ void uwsgi_psgi_preinit_apps(void);
++
++extern struct uwsgi_perl uperl;
+diff --git a/plugins/psgi/psgi_loader.c b/plugins/psgi/psgi_loader.c
+index 1e61f0e9..a9211185 100644
+--- a/plugins/psgi/psgi_loader.c
++++ b/plugins/psgi/psgi_loader.c
+@@ -1,7 +1,6 @@
+ #include "psgi.h" 
+ 
+ extern struct uwsgi_server uwsgi;
+-struct uwsgi_perl uperl;
+ 
+ extern struct uwsgi_plugin psgi_plugin;
+ 
+diff --git a/plugins/psgi/psgi_plugin.c b/plugins/psgi/psgi_plugin.c
+index e1177be2..8ca0a2ed 100644
+--- a/plugins/psgi/psgi_plugin.c
++++ b/plugins/psgi/psgi_plugin.c
+@@ -3,11 +3,7 @@
+ extern char **environ;
+ extern struct uwsgi_server uwsgi;
+ 
+-#ifdef __APPLE__
+-extern struct uwsgi_perl uperl;
+-#else
+ struct uwsgi_perl uperl;
+-#endif
+ 
+ struct uwsgi_plugin psgi_plugin;
+ 

uwsgi.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun  8 18:09:43 UTC 2020 - James Oakley <jfunk@funktronics.ca>
+
+- Fix duplicate uperl in psgi plugin with wth gcc 10
+
 -------------------------------------------------------------------
 Sat May 16 16:33:23 UTC 2020 - James Oakley <jfunk@funktronics.ca>
 

uwsgi.spec

@@ -42,6 +42,8 @@ Patch2:         uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch
 Patch3:         uwsgi-1.9.11-systemd_logger-old_systemd.patch
 # PATCH-FIX-OPENSUSE uwsgi-2.0.18-postgresql-config.patch - Use pkg-config instead of pg_config
 Patch4:         uwsgi-2.0.18-postgresql-config.patch
+# PATCH-FIX-OPENSUSE uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch - Fix duplicate uperl with gcc 10
+Patch5:         uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch
 %define apache_branch     %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+")
 %if "%{apache_branch}" == "2.4"
   %define apxs %{_bindir}/apxs2
@@ -435,6 +437,7 @@ This package contains support for PHP version 7.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 # Generate a config that builds all plugins except for examples and stuff we
 # can't satisfy the requirements for or are just broken
 excluded_plugins=""