2.5.6-2

Fix PPC64 Debian packaging
NVIDIA · Dec 7, 2019 · 6bb953d · 6bb953d
1 parent 299c554
commit 6bb953d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/makefiles/version.mk b/makefiles/version.mk
@@ -3,4 +3,4 @@ NCCL_MAJOR   := 2
 NCCL_MINOR   := 5
 NCCL_PATCH   := 6
 NCCL_SUFFIX  :=
-PKG_REVISION := 1
+PKG_REVISION := 2
diff --git a/pkg/debian/Makefile b/pkg/debian/Makefile
@@ -16,13 +16,8 @@ DEBFILES   := compat copyright libnccl-dev.install rules $(DEBGEN)
 DEBTARGETS := $(patsubst %, $(DEBPREPDIR)/%, $(DEBFILES))
 
 PKG_TIMESTAMP  := $(shell date -R)
-ARCH           := $(shell uname -m)
-PKG_ARCH       ?= $(shell uname -m | sed -e "s/x86_64/amd64/g" | sed -e "s/ppc64le/ppc64el/g"| sed -e "s/aarch64/arm64/g")
-PKG_MULTIARCH  ?= $(shell $(CXX) -print-multiarch)
-ifeq ($(PKG_MULTIARCH),)
-# Hardwire the PKG_MULTIARCH directory as the RHEL6 distribution agnostic compiler (gcc 4.8.3) doesn't set it
-PKG_MULTIARCH  := $(ARCH)-linux-gnu
-endif
+PKG_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+PKG_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 prep : $(DEBTARGETS)
 	$(MAKE) -C ../.. lic BUILDDIR=$(BUILDDIR)