From: Ward Vandewege <ward@jhvc.com>
Date: Wed, 5 Jan 2022 21:38:52 +0000 (-0500)
Subject: 17417: Merge branch 'main' into 17417-add-arm64
X-Git-Tag: 2.4.0~118^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/56c4d0c08266cacbca73e77aa82939e00a0bb69e

17417: Merge branch 'main' into 17417-add-arm64

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

56c4d0c08266cacbca73e77aa82939e00a0bb69e
diff --cc build/run-library.sh
index 9d0dffc0a0,4a3e756ad9..8a228622af
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@@ -221,26 -151,15 +221,26 @@@ package_go_binary_worker() 
      calculate_go_package_version go_package_version $src_path
  
      cd $WORKSPACE/packages/$TARGET
 -    test_package_presence $prog $go_package_version go
 -
 -    if [[ "$?" != "0" ]]; then
 -      return 1
 +    test_package_presence "$prog" "$go_package_version" "go" "" "$target_arch"
 +    if [[ $? -ne 0 ]]; then
 +      return 0
      fi
  
 -    go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
 +    echo "Building $package_format ($target_arch) package for $prog from $src_path"
 +    if [[ "$native_arch" == "amd64" ]] && [[ "$target_arch" == "arm64" ]]; then
-       CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=${target_arch} go get -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
++      CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=${target_arch} go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
 +    else
-       GOARCH=${arch} go get -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
++      GOARCH=${arch} go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
 +    fi
  
      local -a switches=()
 +
 +    binpath=$GOPATH/bin/${basename}
 +    if [[ "${target_arch}" != "${native_arch}" ]]; then
 +      switches+=("-a${target_arch}")
 +      binpath="$GOPATH/bin/linux_${target_arch}/${basename}"
 +    fi
 +
      systemd_unit="$WORKSPACE/${src_path}/${prog}.service"
      if [[ -e "${systemd_unit}" ]]; then
          switches+=(