[arch-commits] Commit in vagrant/trunk (PKGBUILD relax_ruby_version.patch)
Anatol Pomozov
anatolik at archlinux.org
Sat Mar 20 00:18:56 UTC 2021
Date: Saturday, March 20, 2021 @ 00:18:56
Author: anatolik
Revision: 895483
Add workarounds for golang 1.16 and ruby 3.0 build issues
Added:
vagrant/trunk/relax_ruby_version.patch
Modified:
vagrant/trunk/PKGBUILD
--------------------------+
PKGBUILD | 13 +++++++++++--
relax_ruby_version.patch | 18 ++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-20 00:18:21 UTC (rev 895482)
+++ PKGBUILD 2021-03-20 00:18:56 UTC (rev 895483)
@@ -22,14 +22,23 @@
conflicts=('vagrant-substrate')
replaces=('vagrant-substrate')
source=($pkgname-$pkgver.tar.gz::https://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
- "git+https://github.com/mitchellh/vagrant-installers.git#commit=4ddca26")
+ "git+https://github.com/mitchellh/vagrant-installers.git#commit=4ddca26"
+ relax_ruby_version.patch)
md5sums=('fef064ac4c3aa80ce64addcfc4666196'
- 'SKIP')
+ 'SKIP'
+ '5a680e21dc1128613fdf0d744cd68d34')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 < ../relax_ruby_version.patch
+}
+
build() {
cd $pkgname-$pkgver
gem build $pkgname.gemspec
+
+ export GO111MODULE=off # golang 1.16 uses modules by default and packages below fail to compile
cd "$srcdir"/vagrant-installers/substrate/launcher
go get github.com/mitchellh/osext
Added: relax_ruby_version.patch
===================================================================
--- relax_ruby_version.patch (rev 0)
+++ relax_ruby_version.patch 2021-03-20 00:18:56 UTC (rev 895483)
@@ -0,0 +1,18 @@
+commit 2801c182d65204da7af585578f68901f81deb3f9
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date: Mon Jun 5 21:54:53 2017 -0700
+
+ Relax ruby version to match Arch Linux version
+
+diff --git a/vagrant.gemspec b/vagrant.gemspec
+index c45607b74..f09e494c4 100644
+--- a/vagrant.gemspec
++++ b/vagrant.gemspec
+@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
+ s.summary = "Build and distribute virtualized development environments."
+ s.description = "Vagrant is a tool for building and distributing virtualized development environments."
+
+- s.required_ruby_version = "~> 2.5", "< 2.8"
+ s.required_rubygems_version = ">= 1.3.6"
+
+ s.add_dependency "bcrypt_pbkdf", "~> 1.0.0"
More information about the arch-commits
mailing list