From c5b9334be225ad44bf05a8b3bef14265f7115266 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 18 Aug 2021 12:37:27 +0200 Subject: [PATCH] Revert "libclc: Include libclc spir-v outputs (used by Mesa opencl)" This reverts commit f572d3695eceeeaf897631c3c12679dc00190c57. --- debian/changelog | 1 - debian/control | 3 +-- debian/libclc-X.Y.install.in | 1 - debian/patches/libclc-llvm-spirv.diff | 13 ------------- debian/patches/series | 2 -- debian/rules | 22 +--------------------- 6 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 debian/patches/libclc-llvm-spirv.diff diff --git a/debian/changelog b/debian/changelog index aea5be7b..458fe21f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,6 @@ llvm-toolchain-12 (1:12.0.1-5) unstable; urgency=medium llvm-toolchain-12 (1:12.0.1-4) unstable; urgency=medium - [ Sylvestre Ledru ] * Make libunwind-dev depends on libunwind * Don't build libunwind on hurd, armel, powerpc & mipsel * Remove old svn reference in the usage dh_strip & dh_makeshlibs diff --git a/debian/control b/debian/control index 52dc92ac..9ce586c5 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, ocaml-findlib [amd64 arm64 armhf ppc64el s390x], libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv, spirv-tools + libpfm4-dev [linux-any], python3-setuptools, libz3-dev Build-Conflicts: oprofile, ocaml Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ diff --git a/debian/libclc-X.Y.install.in b/debian/libclc-X.Y.install.in index 679ba86f..36023694 100644 --- a/debian/libclc-X.Y.install.in +++ b/debian/libclc-X.Y.install.in @@ -1,2 +1 @@ usr/lib/clc/*.bc -usr/lib/clc/*.spv diff --git a/debian/patches/libclc-llvm-spirv.diff b/debian/patches/libclc-llvm-spirv.diff deleted file mode 100644 index d6a57203..00000000 --- a/debian/patches/libclc-llvm-spirv.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt -index b8b5ceff086c..5964468358f2 100644 ---- a/libclc/CMakeLists.txt -+++ b/libclc/CMakeLists.txt -@@ -95,7 +95,7 @@ find_program( LLVM_CLANG clang PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) - find_program( LLVM_AS llvm-as PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) - find_program( LLVM_LINK llvm-link PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) - find_program( LLVM_OPT opt PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) --find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) -+find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_BINDIR}) - - # Print toolchain - message( "clang: ${LLVM_CLANG}" ) diff --git a/debian/patches/series b/debian/patches/series index aa6a7590..11663d97 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -144,5 +144,3 @@ lld-use-link-atomic-i386.diff D99501-ignore-lto-auto.diff scan-build-py-fix-analyze-path.diff scan-build-py-fix-default-bin.diff - -libclc-llvm-spirv.diff diff --git a/debian/rules b/debian/rules index 32e523df..6821c432 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,6 @@ endif VENDOR=$(shell lsb_release -is) DISTRO=$(shell lsb_release -sc) -DISTRO_RELEASE=$(shell lsb_release -sr) DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') @@ -133,25 +132,6 @@ else control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' endif -ENABLE_SPRIV = yes -# Disable spirv on Debian older than bullseye (11) -ifeq ($(shell dpkg-vendor --is Debian && echo yes),yes) -ifeq ($(shell dpkg --compare-versions $(DISTRO_RELEASE) lt 11 ; echo $$?),0) - ENABLE_SPRIV = no -endif -endif -# Disable spirv on Ubuntu older than focal (20.04) -ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) -ifeq ($(shell dpkg --compare-versions $(DISTRO_RELEASE) lt 20 ; echo $$?),0) - ENABLE_SPRIV = no -endif -endif - -LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" -ifeq ($(ENABLE_SPRIV),yes) - LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-" -endif - # Disabled: # Host compiler does not support '-fuse-ld=lld' # USE_LLD_ARCHS := amd64 @@ -561,7 +541,7 @@ debian-libclc-build: -DCMAKE_INSTALL_DATADIR=lib \ -DCMAKE_INSTALL_INCLUDEDIR=include \ -DLLVM_CONFIG=$(CURDIR)/$(TARGET_BUILD_STAGE2)/bin/llvm-config \ - -DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \ + -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"; \ make $(NJOBS) $(VERBOSE) touch $@