diff --git a/debian/control b/debian/control index cf7545c0..54491f94 100644 --- a/debian/control +++ b/debian/control @@ -25,9 +25,10 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], libcurl4-dev, - libgrpc++-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64 ppc64el powerpc s390x], - protobuf-compiler-grpc [amd64 arm64 armel armhf i386 mips64el mipsel ppc64 ppc64el powerpc s390x], - libprotobuf-dev, protobuf-compiler + libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x], + protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x], + libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x], + protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] # "| hello" is for older buster/bionic distros without spirv support Build-Conflicts: oprofile Standards-Version: 4.2.1 diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index b967aff8..d412750d 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -1,3 +1,5 @@ +#!/usr/bin/dh-exec + usr/lib/llvm-@LLVM_VERSION@/include/clang usr/lib/llvm-@LLVM_VERSION@/include/clang-c usr/lib/llvm-@LLVM_VERSION@/include/clang-tidy @@ -5,3 +7,8 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a + +# clangd grpc architectures +[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a +[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a +[amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc s390x] usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a diff --git a/debian/rules b/debian/rules index 02070479..ce5d59e2 100755 --- a/debian/rules +++ b/debian/rules @@ -455,6 +455,7 @@ preconfigure: # Make install file executable for dh-exec chmod +x \ debian/clang-tools-$(LLVM_VERSION).install \ + debian/libclang-$(LLVM_VERSION)-dev.install \ debian/libclang-common-$(LLVM_VERSION)-dev.install \ debian/libomp-$(LLVM_VERSION)-dev.install \ debian/llvm-$(LLVM_VERSION)-dev.install \