From bf2f1f0152b797edff1800e7938b704a915e23d8 Mon Sep 17 00:00:00 2001 From: aliriza Date: Wed, 7 Dec 2022 14:05:07 +0000 Subject: [PATCH] meson setuptools move to common site-packages directory --- dev/python/setuptools/ympbuild | 3 +-- dev/util/meson/ympbuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev/python/setuptools/ympbuild b/dev/python/setuptools/ympbuild index 8f899378..4bfdbf2f 100644 --- a/dev/python/setuptools/ympbuild +++ b/dev/python/setuptools/ympbuild @@ -22,7 +22,6 @@ build(){ } package(){ - python3 setup.py install --root="${DESTDIR}" --optimize=1 --skip-build - mv ${DESTDIR}/usr/lib{,64} + python3 setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build } diff --git a/dev/util/meson/ympbuild b/dev/util/meson/ympbuild index d03ba65b..7d919dea 100644 --- a/dev/util/meson/ympbuild +++ b/dev/util/meson/ympbuild @@ -22,7 +22,7 @@ build(){ } package(){ - python setup.py install --root="${DESTDIR}" --optimize=1 --skip-build + python setup.py install --root="${DESTDIR}" --install-lib=/usr/lib64/python3 --optimize=1 --skip-build install -d "${DESTDIR}/usr/share/vim/vimfiles" cp -rt "${DESTDIR}/usr/share/vim/vimfiles" data/syntax-highlighting/vim/*/ @@ -30,6 +30,5 @@ package(){ install -Dt "${DESTDIR}/usr/share/zsh/site-functions" -m644 data/shell-completions/zsh/* # fix hardcoded interpreter location sed -i "1s|.*|#!/usr/bin/env python3|g" "${DESTDIR}/usr/bin/meson" - mv ${DESTDIR}/usr/lib{,64} }