system/ripgrep: Updated for version 0.7.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

1 files changed, 80 insertions, 75 deletions

diff --git a/system/ripgrep/ripgrep.SlackBuild b/system/ripgrep/ripgrep.SlackBuild
index a4e4369aad..9471207b58 100644
--- a/system/ripgrep/ripgrep.SlackBuild
+++ b/system/ripgrep/ripgrep.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ripgrep
-VERSION=${VERSION:-0.6.0}
+VERSION=${VERSION:-0.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,15 +43,19 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+  CARGOTARGET="--target i586-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  CARGOTARGET="--target i686-unknown-linux-gnu"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  CARGOTARGET=""
 fi
 
 set -e
@@ -76,78 +80,77 @@ replace-with = 'vendored-sources'
 directory = '$(pwd)/vendor'
 EOF
 
-if [ -e $CWD/$PRGNAM-$VERSION-vendor.tar.gz ] ; then
-  tar xvf $CWD/$PRGNAM-$VERSION-vendor.tar.gz
-else
-  # deps and versions come from Cargo.lock
-  mkdir vendor
-  (
-    cd vendor
-
-    for dependency in aho-corasick=0.6.3 \
-                      ansi_term=0.9.0 \
-                      atty=0.2.2 \
-                      bitflags=0.9.1 \
-                      bytecount=0.1.7 \
-                      cfg-if=0.1.2 \
-                      clap=2.26.0 \
-                      crossbeam=0.2.10 \
-                      encoding_rs=0.6.11 \
-                      env_logger=0.4.3 \
-                      fnv=1.0.5 \
-                      fs2=0.4.2 \
-                      kernel32-sys=0.2.2 \
-                      lazy_static=0.2.8 \
-                      libc=0.2.29 \
-                      log=0.3.8 \
-                      memchr=1.0.1 \
-                      memmap=0.5.2 \
-                      num_cpus=1.6.2 \
-                      regex=0.2.2 \
-                      regex-syntax=0.4.1 \
-                      same-file=0.1.3 \
-                      simd=0.1.1 \
-                      simd=0.2.0 \
-                      strsim=0.6.0 \
-                      term_size=0.3.0 \
-                      textwrap=0.7.0 \
-                      thread_local=0.3.4 \
-                      unicode-segmentation=1.2.0 \
-                      unicode-width=0.1.4 \
-                      unreachable=1.0.0 \
-                      utf8-ranges=1.0.0 \
-                      vec_map=0.8.0 \
-                      void=1.0.2 \
-                      walkdir=1.0.7 \
-                      winapi=0.2.8 \
-                      winapi-build=0.1.1; do
-      dep="$(echo "$dependency" | cut -d= -f1)"
-      ver="$(echo "$dependency" | cut -d= -f2)"
-
-      tar xvf $CWD/$dep-$ver.crate
-
-      touch $dep-$ver/.cargo-ok
-
-      # generate checksum
-      {
-        printf "{\n"
-        printf '    "files": {\n'
-
-        (
-          cd $dep-$ver
-          find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
-        ) | sed '$ s/,$//'
-
-        printf "    },\n"
-        printf '    "package": "'
-
-        sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
-
-        printf "}\n"
-      } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
-    done
-  )
-fi
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  for dependency in aho-corasick=0.6.3 \
+                    ansi_term=0.9.0 \
+                    atty=0.2.3 \
+                    bitflags=0.9.1 \
+                    bytecount=0.1.7 \
+                    cfg-if=0.1.2 \
+                    clap=2.26.2 \
+                    crossbeam=0.2.10 \
+                    encoding_rs=0.7.1 \
+                    env_logger=0.4.3 \
+                    fnv=1.0.5 \
+                    fs2=0.4.2 \
+                    kernel32-sys=0.2.2 \
+                    lazy_static=0.2.9 \
+                    libc=0.2.32 \
+                    log=0.3.8 \
+                    memchr=1.0.2 \
+                    memchr=2.0.0 \
+                    memmap=0.5.2 \
+                    num_cpus=1.7.0 \
+                    redox_syscall=0.1.31 \
+                    redox_termios=0.1.1 \
+                    regex=0.2.2 \
+                    regex-syntax=0.4.1 \
+                    same-file=1.0.0 \
+                    simd=0.1.1 \
+                    simd=0.2.0 \
+                    strsim=0.6.0 \
+                    term_size=0.3.0 \
+                    termion=1.5.1 \
+                    textwrap=0.8.0 \
+                    thread_local=0.3.4 \
+                    unicode-width=0.1.4 \
+                    unreachable=1.0.0 \
+                    utf8-ranges=1.0.0 \
+                    vec_map=0.8.0 \
+                    void=1.0.2 \
+                    walkdir=2.0.1 \
+                    winapi=0.2.8 \
+                    winapi-build=0.1.1; do
+    dep="$(echo "$dependency" | cut -d= -f1)"
+    ver="$(echo "$dependency" | cut -d= -f2)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+  done
+)
 
 chown -R root:root .
 find -L . \
@@ -156,11 +159,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cargo build --release
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin/
 
-install -m 755 target/release/rg $PKG/usr/bin
+find target -name rg -exec install -m 755 {} $PKG/usr/bin/rg \;
 
 mkdir -p $PKG/usr/share/bash-completion/completions/
 find target/release -name rg.bash-completion -exec install -m644 {} $PKG/usr/share/bash-completion/completions/rg \;