[gentoo-commits] proj/pkgcore/pkgcore:master commit in: /, data/lib/pkgcore/ebd/

[Arthur Zamarin]

commit:     ac0638d3bf4824c7874e08dc31abb23b05399efa
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 11:09:10 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 18:58:28 2022 +0000
URL:        
https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=ac0638d3

fix build for newest pip

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 data/lib/pkgcore/ebd/Makefile | 4 ++--
 py_build.py                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/lib/pkgcore/ebd/Makefile b/data/lib/pkgcore/ebd/Makefile
index ec6280a33..b812176d9 100644
--- a/data/lib/pkgcore/ebd/Makefile
+++ b/data/lib/pkgcore/ebd/Makefile
@@ -1,6 +1,6 @@
 PYTHON ?= python
-REPO_SRC = ../../../../src
-PYTHON_CALL = PYTHONPATH=$(REPO_SRC) PYTHONDONTWRITEBYTECODE=1 $(PYTHON)
+PYTHONPATH ?= ../../../../src
+PYTHON_CALL = PYTHONPATH="$(PYTHONPATH)" PYTHONDONTWRITEBYTECODE=1 $(PYTHON)
 
 TARGET = .generated
 KNOWN_EAPI = 0 1 2 3 4 5 6 7 8

diff --git a/py_build.py b/py_build.py
index 48394046f..fe1adb1d9 100644
--- a/py_build.py
+++ b/py_build.py
@@ -62,7 +62,7 @@ def prepare_pkgcore(callback, consts: bool):
                 write_pkgcore_lookup_configs(cleanup_files)
 
             # generate function lists so they don't need to be created on 
install
-            if subprocess.call(['make', f'PYTHON={sys.executable}'], 
cwd=Path.cwd() / 'data/lib/pkgcore/ebd'):
+            if subprocess.call(['make', f'PYTHON={sys.executable}', 
'PYTHONPATH=' + ':'.join(sys.path)], cwd=Path.cwd() / 'data/lib/pkgcore/ebd'):
                 raise Exception("Running makefile failed")
 
             return callback()