Fix build (disable fbgemm). Add missing libs. Fix insecure rpath.

2 files changed, 18 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f50a03a0e13c..e61e8d0f75f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = caffe2-cuda-git
 	pkgdesc = A new lightweight, modular, and scalable deep learning framework (with cuda, git version)
-	pkgver = 0.8.2.r14563.g4f622c26b9
+	pkgver = 0.8.2.r14826.gf79fb58744
 	pkgrel = 1
 	url = https://caffe2.ai/
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 107235000df1..443b43899839 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=caffe2-cuda-git
 _srcname=pytorch
-pkgver=0.8.2.r14563.g4f622c26b9
+pkgver=0.8.2.r14826.gf79fb58744
 pkgrel=1
 pkgdesc='A new lightweight, modular, and scalable deep learning framework (with cuda, git version)'
 arch=('x86_64')
@@ -157,6 +157,9 @@ build() {
     mkdir -p build
     cd build
     
+    # NOTE:
+    # skip install rpath to remove unneeded insecure rpath
+    
     cmake \
         -DBLAS:STRING='Eigen' \
         \
@@ -172,6 +175,8 @@ build() {
         -DCMAKE_INSTALL_LIBDIR:PATH='lib' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         \
+        -DCMAKE_SKIP_INSTALL_RPATH:BOOL='YES' \
+        \
         -DCUDA_HOST_COMPILER:FILEPATH='/usr/bin/gcc-7' \
         -DCUDA_NVCC_EXECUTABLE:FILEPATH='/opt/cuda/bin/nvcc' \
         -DCUDA_SDK_ROOT_DIR:PATH='/opt/cuda' \
@@ -196,7 +201,7 @@ build() {
         -DUSE_CUDA:BOOL='ON' \
         -DUSE_CUDNN:BOOL='ON' \
         -DUSE_DISTRIBUTED:BOOL='ON' \
-        -DUSE_FBGEMM:BOOL='ON' \
+        -DUSE_FBGEMM:BOOL='OFF' \
         -DUSE_FFMPEG:BOOL='ON' \
         -DUSE_GFLAGS:BOOL='ON' \
         -DUSE_GLOG:BOOL='ON' \
@@ -255,17 +260,17 @@ package() {
     # remove unneeded files
     local _entry
     local _exclude_dirs
-    local _exclude_libs
     mapfile -t -d '' _exclude_dirs < <(find "${pkgdir}/usr/include" -mindepth 1 -maxdepth 1 -type d ! -name 'caffe*' -print0)
-    mapfile -t -d '' _exclude_libs < <(find -L "${pkgdir}/usr/lib" -maxdepth 1 -type f ! -name 'libcaffe*' -print0)
-    rm -f  "$pkgdir"/usr/bin/{protoc,unzstd,zstd{cat,mt,}}
-    rm -f  "$pkgdir"/usr/include/{*.h,*.py}
-    rm -rf "$pkgdir"/usr/lib/cmake/protobuf
-    rm -f  "$pkgdir"/usr/lib/pkgconfig/{protobuf-lite,protobuf}.pc
-    rm -rf "$pkgdir"/usr/share/pkgconfig
-    rm -rf "$pkgdir"/usr/share/{ATen,cmake/{ATen,ONNX}}
-    rm -f  "$pkgdir"/usr/share/man/man1/{unzstd,zstd{cat,}}.1
-    for _entry in "${_exclude_dirs[@]}" "${_exclude_libs[@]}"
+    rm    "$pkgdir"/usr/bin/{protoc,unzstd,zstd{cat,mt,}}
+    rm    "$pkgdir"/usr/include/{*.h,*.py}
+    rm    "$pkgdir"/usr/lib/*.a
+    rm    "$pkgdir"/usr/lib/lib{zstd,onnxifi}*
+    rm -r "$pkgdir"/usr/lib/cmake/protobuf
+    rm    "$pkgdir"/usr/lib/pkgconfig/{protobuf-lite,protobuf}.pc
+    rm    "$pkgdir"/usr/share/pkgconfig/libzstd.pc
+    rm -r "$pkgdir"/usr/share/{ATen,cmake/{ATen,ONNX,Gloo}}
+    rm    "$pkgdir"/usr/share/man/man1/{unzstd,zstd{cat,}}.1
+    for _entry in "${_exclude_dirs[@]}"
     do
         rm -rf "$_entry"
     done