rpms/redhat-rpm-config
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BRP Python Bytecompile: Avoid hardcoding /usr/bin prefix for python

Browse Source 
Avoid using the full path and instead rely on PATH being correctly set
up to find the executable.

This fixes byte compilation for python2.7 when doing flatpak module
builds where python2.7 can be in either /usr/bin or /app/bin, depending
on how it's compiled.
This commit is contained in:
Kalev Lember 2021-03-10 17:09:14 +01:00
parent c022fd5270
commit c6015fffb6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brp-python-bytecompile
View File

@ -121,7 +121,7 @@ export PYTHONHASHSEED=0
shopt -s nullglob
for python_libdir in `find "$RPM_BUILD_ROOT" -type d|grep -E "/(usr|app)/lib(64)?/python[0-9]\.[0-9]+$"`;
do
python_binary=/usr/bin/$(basename $python_libdir)
python_binary=$(basename $python_libdir)
real_libdir=${python_libdir/$RPM_BUILD_ROOT/}
echo "Bytecompiling .py files below $python_libdir using $python_binary"

5
redhat-rpm-config.spec
View File

@ -6,7 +6,7 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 174
Version: 175
Release: 1%{?dist}
# No version specified.
License: GPL+
@ -213,6 +213,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%{_rpmconfigdir}/macros.d/macros.kmp
%changelog
* Wed Mar 10 2021 Kalev Lember <klember@redhat.com> - 175-1
- BRP Python Bytecompile: Avoid hardcoding /usr/bin prefix for python
* Sun Nov 29 2020 Miro Hrončok <mhroncok@redhat.com> - 174-1
- BRP Python Bytecompile: Also detect Python files in /app/lib/pythonX.Y