pool/uwsgi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Use pkg-config instead of pg_config as it was removed in postgres11-devel

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=80
This commit is contained in:
James Oakley 2019-03-16 00:52:40 +00:00 committed by Git OBS Bridge
parent e55adcfca5
commit 9c383c6f57
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
uwsgi-2.0.18-postgresql-config.patch Normal file
View File

@ -0,0 +1,16 @@
--- a/plugins/emperor_pg/uwsgiplugin.py
+++ b/plugins/emperor_pg/uwsgiplugin.py
@@ -2,11 +2,8 @@ import os
NAME = 'emperor_pg'
-CFLAGS = ['-I' + os.popen('pg_config --includedir').read().rstrip()]
+CFLAGS = os.popen('pkg-config --cflags libpq').read().rstrip().split()
LDFLAGS = []
-LIBS = [
- '-L' + os.popen('pg_config --libdir').read().rstrip(),
- '-lpq'
-]
+LIBS = os.popen('pkg-config --libs libpq').read().rstrip().split()
GCC_LIST = ['emperor_pg']

5
uwsgi.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 16 00:45:25 UTC 2019 - James Oakley <jfunk@funktronics.ca>
- Use pkg-config instead of pg_config as it was removed in postgres11-devel
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 9 16:19:37 UTC 2019 - Michael Ströder <michael@stroeder.com> Sat Feb 9 16:19:37 UTC 2019 - Michael Ströder <michael@stroeder.com>

7
uwsgi.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package uwsgi # spec file for package uwsgi
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -40,6 +40,8 @@ Patch1: uwsgi-2.0.12-no-LD_RUN_PATH.patch
Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch
# PATCH-FIX-OPENSUSE uwsgi-1.9.11-systemd_logger-old_systemd.patch - Older systemd in 12.2 does not implicity include syslog.h # PATCH-FIX-OPENSUSE uwsgi-1.9.11-systemd_logger-old_systemd.patch - Older systemd in 12.2 does not implicity include syslog.h
Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.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
%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") %define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+")
%if "%{apache_branch}" == "2.4" %if "%{apache_branch}" == "2.4"
%define apxs %{_bindir}/apxs2 %define apxs %{_bindir}/apxs2
@ -441,6 +443,7 @@ This package contains support for PHP version 7.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# Generate a config that builds all plugins except for examples and stuff we # Generate a config that builds all plugins except for examples and stuff we
# can't satisfy the requirements for or are just broken # can't satisfy the requirements for or are just broken
excluded_plugins="" excluded_plugins=""