Skip to content

Remove venv usage when installing psp-pacman #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
diamant3 wants to merge 1 commit into from
Closed

Remove venv usage when installing psp-pacman #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,3 @@ function download_and_extract
function apply_patch {
patch -p1 < "${BASE_PATH}/patches/$1.patch"
}

## Install meson and ninja in the current directory using a venv
function setup_build_system {
python3 -m venv venv
. venv/bin/activate
pip install meson ninja
}
3 changes: 0 additions & 3 deletions pacman.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ find ./ -type f -name "*.in" -exec sed -i -e 's#@libmakepkgdir@#${PSPDEV}/share/
## Apply patch
apply_patch pacman-${PACMAN_VERSION}

## Install meson and ninja in the current directory
setup_build_system

## Build pacman
meson build -Dprefix="${PSPDEV}" --buildtype=release \
-Ddefault_library=static -Dbuildscript=PSPBUILD \
Expand Down
Loading