Upstream update

2 files changed, 7 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9f80d0e897a..afbb35d33184 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Dec 22 09:49:41 UTC 2015
+# Fri Sep 23 12:00:48 UTC 2016
 pkgbase = vagrant-git
 	pkgdesc = Build and distribute virtualized development environments
-	pkgver = 1.8.0.2.gf7bdcb1
+	pkgver = 1.8.5.95.g7ceac14
 	pkgrel = 1
 	url = http://vagrantup.com
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 98f7462c3e9e..6829dab94e78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=vagrant
 pkgname=vagrant-git
-pkgver=1.8.0.2.gf7bdcb1
+pkgver=1.8.5.95.g7ceac14
 pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('i686' 'x86_64')
@@ -30,9 +30,12 @@ build() {
   cp vagrant-*.gem vagrant.gem
 
   GEM_PATH="$srcdir"/$_pkgname/gems-$pkgver-$pkgrel GEM_HOME="$GEM_PATH" \
-  GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \
+  GEMRC="$EMBEDDED_DIR"/etc/gemrc \
+  CPPFLAGS="-I$EMBEDDED_DIR/include -I${EMBEDDED_DIR}/include/libxml2" \
+  CFLAGS="${CPPFLAGS}" \
   LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
   SSL_CERT_FILE="$EMBEDDED_DIR"/cacert.pem \
+  NOKOGIRI_USE_SYSTEM_LIBRARIES=1 \
     "$EMBEDDED_DIR"/bin/gem install $_pkgname.gem --no-ri --no-rdoc
 }