From b479adebed4a277e09a307696c10bd5c1f05eadd Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Thu, 28 Jan 2021 20:43:25 +0100 Subject: [PATCH] oil: update to 0.8.7, don't pretend we are using system python. Closes: #28293 [via git-merge-pr] --- srcpkgs/oil/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template index df432c0f28..69ea84476e 100644 --- a/srcpkgs/oil/template +++ b/srcpkgs/oil/template @@ -1,20 +1,19 @@ # Template file for 'oil' pkgname=oil -version=0.8.6 +version=0.8.7 revision=1 build_style=configure configure_args="--prefix=/usr $(vopt_with readline)" -hostmakedepends="$(vopt_if readline readline-devel) python" +hostmakedepends="$(vopt_if readline readline-devel)" makedepends="$hostmakedepends" short_desc="Oil, a new unix shell" maintainer="Orphaned " license="Apache-2.0" homepage="https://www.oilshell.org" distfiles="${homepage}/download/${pkgname}-${version}.tar.xz" -checksum=7d7d66888f325f39ff4fd71b6d9ffb13afed2ecdd15ec5f73e07c2eec0712235 -python_version=2 +checksum=29c5eed6efccbef6c22dbe5aec3d3d36f7c93da7a8d1cf19fc2cee93b5d1db73 register_shell="/usr/bin/osh" -nocross="Binaries doesn't build if cross built" +nocross="Build systems gets confused with host and cross toolchains/headers" nostrip=yes build_options="readline" @@ -23,8 +22,6 @@ build_options_default="readline" pre_build() { # Remove the strip wrapper rm -f "${XBPS_WRAPPERDIR}"/strip - # Use system python - vsed -i 's|$PREPARE_DIR/python|python|g' build/actions.sh } do_install() {