Fix build flags to work with gcc5

1 files changed, 13 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1ae0450d252e..2d3d7fa23d59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=caffe-git
 _srcname=caffe
-pkgver=1.0.r11.g91b09280f
-pkgrel=2
+pkgver=1.0.r14.g4efdf7ee4
+pkgrel=1
 pkgdesc="A deep learning framework made with expression, speed, and modularity in mind (git version, gpu enabled)"
 arch=('x86_64')
 url="http://caffe.berkeleyvision.org/"
@@ -101,15 +101,21 @@ pkgver() {
 
 build() {
     cd "$pkgname"
+    _gcc5_cxxflags="$(printf '%s' "$CXXFLAGS" | sed 's/-fno-plt//')"
+    _gcc5_cflags="$(  printf '%s' "$CFLAGS"   | sed 's/-fno-plt//')"
+    
     msg2 "Building target 'all'..."
-    make all
+    CXXFLAGS="$_gcc5_cxxflags" CFLAGS="$_gcc5_cflags" make all
+    
     msg2 "Building target 'pycaffe'..."
-    make pycaffe
-    rm -rf doxygen
+    CXXFLAGS="$_gcc5_cxxflags" CFLAGS="$_gcc5_cflags" make pycaffe
+    
     msg2 "Building target 'docs'..."
-    make docs
+    rm -rf doxygen
+    CXXFLAGS="$_gcc5_cxxflags" CFLAGS="$_gcc5_cflags" make docs
+    
     msg2 "Building target 'distribute'..."
-    make distribute
+    CXXFLAGS="$_gcc5_cxxflags" CFLAGS="$_gcc5_cflags" make distribute
 }
 
 # uncomment this block if you want to run the checks/tests