Merge branch 'build-zstd'

.gitlab-ci.yml

 variables:
   GIT_DEPTH: "1"
   ARIA2_VERSION: '1.36.0'
+  ZSTD_VERSION: '1.5.2'
 
 stages:
   - prepare
@@ -8,7 +9,7 @@ stages:
   - combine
   - deploy
 
-aria2_src:
+get_src:
   stage: prepare
   tags:
     - linux
@@ -18,36 +19,45 @@ aria2_src:
     #- cd aria2-src
     #- autoreconf -i
     #- cd ..
-    - mkdir aria2-src
-    - wget -O - https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}.tar.gz | tar --strip-components=1 -C aria2-src -zxf -
+    - mkdir -p src/aria2 src/zstd
+    - wget -O - https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}.tar.gz | tar --strip-components=1 -C src/aria2 -zxf -
+    - wget -O - https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz | tar --strip-components=1 -C src/zstd -zxf -
   artifacts:
     paths:
-      - aria2-src
+      - src
 
 .macOS_bin_arch:
   stage: build
   before_script:
-    - brew install automake autoconf libtool pkg-config docutils libxml2 git gnu-tar zstd
+    - brew install automake autoconf libtool pkg-config docutils libxml2 git gnu-tar
   dependencies:
-    - aria2_src
+    - get_src
   artifacts:
     paths:
       - arch-bin
   script:
+    # gtar
+    - mkdir -p arch-bin/${targetArch}
+    - cp -L -f ${homebrewRoot}/bin/gtar arch-bin/${targetArch}/
+
+    # zstd
+    - cd src/zstd/programs
+    - make -j4 HAVE_LZMA=0 HAVE_LZ4=0 HAVE_ZLIB=0
+    - cp -L -f ./zstd ../../../arch-bin/${targetArch}/
+    - cd ../..
+
+    # aria2
     - export PATH=${PATH}:${homebrewRoot}/opt/gettext/bin
     - export PKG_CONFIG_PATH="${homebrewRoot}/opt/libxml2/lib/pkgconfig"
     - export LDFLAGS="-L${homebrewRoot}/opt/libxml2/lib"
     - export CPPFLAGS="-I${homebrewRoot}/opt/libxml2/include"
-
-    - cd aria2-src
-    - mv ../aria2-makefiles/Makefile.${targetArch} ./Makefile.release
+    - cd aria2
+    - mv ../../aria2-makefiles/Makefile.${targetArch} ./Makefile.release
     - make -f ./Makefile.release aria2.${targetArch}.build
+    - mv aria2.${targetArch}/src/aria2c ../../arch-bin/${targetArch}/
     - cd ..
 
-    - mkdir -p arch-bin/${targetArch}
-    - cp -L -f ${homebrewRoot}/bin/gtar arch-bin/${targetArch}/
-    - cp -L -f ${homebrewRoot}/bin/zstd arch-bin/${targetArch}/
-    - mv aria2-src/aria2.${targetArch}/src/aria2c arch-bin/${targetArch}/
+    - cd ..
 
 macOS_bin_x86_64:
   extends: .macOS_bin_arch