summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMassimiliano Torromeo2017-11-14 14:43:59 +0100
committerMassimiliano Torromeo2017-11-14 14:44:06 +0100
commita5447160598a9580760e0494a88379b27de1f49e (patch)
treecc4ef3cf3073311777017238d312b707a5ce43d8
parenteed57d55bd241eadc4bbdbbe45fe67a2956d9183 (diff)
downloadaur-a5447160598a9580760e0494a88379b27de1f49e.tar.gz
Updated for latest vagrant
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD33
2 files changed, 17 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5c613515ff..0a6be2a4197 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
# Generated by mksrcinfo v8
-# Mon Sep 4 13:45:17 UTC 2017
+# Tue Nov 14 13:44:02 UTC 2017
pkgbase = vagrant-libvirt
pkgdesc = libvirt provider plugin for Vagrant
pkgver = 0.0.40
- pkgrel = 7
+ pkgrel = 8
url = https://github.com/vagrant-libvirt/vagrant-libvirt
arch = i686
arch = x86_64
license = MIT
makedepends = git
- makedepends = chrpath
depends = vagrant
depends = libvirt
depends = openssl-1.0
diff --git a/PKGBUILD b/PKGBUILD
index 9e3581da484..9061027680d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=vagrant-libvirt
pkgver=0.0.40
-pkgrel=7
+pkgrel=8
_foglibvirtver=0.3.0
_fogcorever=1.43.0
_fogjsonver=1.0.2
@@ -15,7 +15,7 @@ arch=(i686 x86_64)
url="https://github.com/vagrant-libvirt/vagrant-libvirt"
license=("MIT")
depends=("vagrant" "libvirt" "openssl-1.0")
-makedepends=("git" "chrpath")
+makedepends=("git")
# "https://rubygems.org/downloads/vagrant-libvirt-$pkgver.gem"
source=("https://github.com/vagrant-libvirt/vagrant-libvirt/archive/$pkgver/$pkgname-$pkgver.tar.gz"
"nokogiri-version.patch"
@@ -53,28 +53,25 @@ prepare() {
build() {
cd "$srcdir/$pkgname-$pkgver"
- /opt/vagrant/embedded/bin/gem build vagrant-libvirt.gemspec
+
+ EMBEDDED_DIR=/opt/vagrant/embedded
+ export GEM_PATH="$EMBEDDED_DIR"/gems
+
+ GEM_HOME="$GEM_PATH" \
+ GEMRC="$EMBEDDED_DIR"/etc/gemrc \
+ gem build vagrant-libvirt.gemspec
}
package() {
cd "$srcdir"
mv $pkgname-$pkgver/$pkgname-$pkgver.gem .
- local GEM_HOME=/opt/vagrant/embedded/gems
+ EMBEDDED_DIR=/opt/vagrant/embedded
+ export GEM_PATH="$EMBEDDED_DIR"/gems
- export CFLAGS="$CFLAGS -DHAVE_VIRNETWORKGETDHCPLEASES -DHAVE_VIRDOMAINMANAGEDSAVE -DHAVE_VIRDOMAINATTACHDEVICEFLAGS -DHAVE_VIRDOMAINISACTIVE -DHAVE_VIRNETWORKISACTIVE -DHAVE_VIRSTORAGEPOOLISPERSISTENT -DHAVE_VIRSTORAGEPOOLISACTIVE -DHAVE_VIRSTORAGEVOLDOWNLOAD -DHAVE_VIRDOMAINGETVCPUPININFO"
-
- for gem in ${noextract[@]}; do
- CONFIGURE_ARGS="with-ldflags='-L/opt/vagrant/embedded/lib -l:libruby.so.2.3' with-libvirt-include=/usr/include with-libvirt-lib=/usr/lib" \
- GEM_HOME=$GEM_HOME \
- GEM_PATH=$GEM_HOME \
- PATH=/opt/vagrant/embedded/bin:$PATH \
- /opt/vagrant/embedded/bin/gem install --ignore-dependencies --no-user-install -N -i "$pkgdir$GEM_HOME" $gem
+ for gem in "${noextract[@]}"; do
+ GEM_HOME="$GEM_PATH" \
+ GEMRC="$EMBEDDED_DIR"/etc/gemrc \
+ gem install --ignore-dependencies --no-user-install -N -i "$pkgdir$GEM_PATH" $gem
done
-
- cd "$pkgdir"/opt/vagrant/embedded/gems
- chrpath -r /usr/lib:/opt/vagrant/embedded/lib \
- gems/ruby-libvirt-*/lib/_libvirt.so \
- gems/ruby-libvirt-*/ext/libvirt/_libvirt.so \
- extensions/*/*/ruby-libvirt-*/_libvirt.so
}