rpm/libselinux
SHA256
1
0
Fork 0
forked from pool/libselinux
Code Pull Requests Activity

Accepting request 744322 from home:mcepl:branches:security:SELinux

Browse Source 
Add python3.8-compat.patch which makes build possible even with
Python 3.8, which doesn’t automatically adds -lpython<ver>

OBS-URL: https://build.opensuse.org/request/show/744322
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=117
This commit is contained in:
Johannes Segitz 2019-11-11 07:03:37 +00:00 committed by Git OBS Bridge
parent 962c260ba0
commit b41ac15d94
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libselinux-bindings.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 30 17:21:00 CET 2019 - Matej Cepl <mcepl@suse.com>
- Add python3.8-compat.patch which makes build possible even with
Python 3.8, which doesn’t automatically adds -lpython<ver>
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 28 08:28:03 UTC 2019 - Martin Liška <mliska@suse.cz> Tue May 28 08:28:03 UTC 2019 - Martin Liška <mliska@suse.cz>

5
libselinux-bindings.spec
View File

@ -31,6 +31,9 @@ Source1: selinux-ready
Source2: baselibs.conf Source2: baselibs.conf
# PATCH-FIX-UPSTREAM Include <sys/uio.h> for readv prototype # PATCH-FIX-UPSTREAM Include <sys/uio.h> for readv prototype
Patch4: readv-proto.patch Patch4: readv-proto.patch
# PATCH-FIX-UPSTREAM python3.8-compat.patch mcepl@suse.com
# Make linking working even when default pkg-config doesn’t provide -lpython<ver>
Patch5: python3.8-compat.patch
BuildRequires: libsepol-devel-static >= %{libsepol_ver} BuildRequires: libsepol-devel-static >= %{libsepol_ver}
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
@ -75,7 +78,7 @@ language.
%prep %prep
%setup -q -n libselinux-%{version} %setup -q -n libselinux-%{version}
%patch4 -p1 %autopatch -p1
%build %build
%define _lto_cflags %{nil} %define _lto_cflags %{nil}

14
python3.8-compat.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,7 +13,11 @@ LIBDIR ?= $(PREFIX)/lib
SHLIBDIR ?= /lib
INCLUDEDIR ?= $(PREFIX)/include
PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX))
+ifeq ($(shell $(PKG_CONFIG) --exists $(PYPREFIX)-embed && echo true), true)
+PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)-embed)
+else
PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX))
+endif
PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))")
PYCEXT ?= $(shell $(PYTHON) -c 'import imp;print([s for s,m,t in imp.get_suffixes() if t == imp.C_EXTENSION][0])')
RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]')