diff options
| author | Ke Wen <kwen@nvidia.com> | 2019-12-06 05:34:55 +0300 |
|---|---|---|
| committer | Ke Wen <kwen@nvidia.com> | 2019-12-07 05:26:39 +0300 |
| commit | 6bb953d4e6b7e6856683a8cc83b9626b3bf421bb (patch) | |
| tree | 2a60a45af1bb5ff9e503879c58143d0773765848 | |
| parent | 299c554dccf923230321ad7495946543f3e9b457 (diff) | |
2.5.6-2
Fix PPC64 Debian packaging
| -rw-r--r-- | makefiles/version.mk | 2 | ||||
| -rw-r--r-- | pkg/debian/Makefile | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/makefiles/version.mk b/makefiles/version.mk index efbdee7..80f6221 100644 --- 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 index 2ce4390..0494f3e 100644 --- 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) |