From e67f5ed7c8026b1bf4b0d1a65e929ed470cb1077 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 24 Sep 2021 21:23:10 +0200 Subject: [PATCH] the libc++* & libunwind builds are installed in directory with triple --- debian/libc++-X.Y-dev.install.in | 6 +++--- debian/libc++1-X.Y.install.in | 2 +- debian/libc++abi-X.Y-dev.install.in | 4 ++-- debian/libc++abi1-X.Y.install.in | 2 +- debian/libunwind-X.Y-dev.install.in | 4 ++-- debian/libunwind-X.Y-dev.links.in | 2 -- debian/libunwind-X.Y-dev.lintian-overrides.in | 2 +- debian/libunwind-X.Y.install.in | 2 +- debian/libunwind-X.Y.links.in | 2 -- debian/libunwind-X.Y.lintian-overrides.in | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in index 085f65e1..d53d94a3 100644 --- a/debian/libc++-X.Y-dev.install.in +++ b/debian/libc++-X.Y-dev.install.in @@ -1,4 +1,4 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.a usr/lib/llvm-@LLVM_VERSION@/include/c++/ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++experimental.a diff --git a/debian/libc++1-X.Y.install.in b/debian/libc++1-X.Y.install.in index 78e2cd3b..606c7fcf 100644 --- a/debian/libc++1-X.Y.install.in +++ b/debian/libc++1-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++.so.* diff --git a/debian/libc++abi-X.Y-dev.install.in b/debian/libc++abi-X.Y-dev.install.in index 8774c6ae..ce71f3e6 100644 --- a/debian/libc++abi-X.Y-dev.install.in +++ b/debian/libc++abi-X.Y-dev.install.in @@ -1,3 +1,3 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi*so -usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi*so +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.a libcxxabi/include/* usr/lib/llvm-@LLVM_VERSION@/include/ diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Y.install.in index 6e27733d..a7e1c070 100644 --- a/debian/libc++abi1-X.Y.install.in +++ b/debian/libc++abi1-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/*/libc++abi.so.* diff --git a/debian/libunwind-X.Y-dev.install.in b/debian/libunwind-X.Y-dev.install.in index 9d1ca3a3..08679820 100644 --- a/debian/libunwind-X.Y-dev.install.in +++ b/debian/libunwind-X.Y-dev.install.in @@ -1,4 +1,4 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a +usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so +usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.a usr/include/libunwind diff --git a/debian/libunwind-X.Y-dev.links.in b/debian/libunwind-X.Y-dev.links.in index 062eac8a..e69de29b 100644 --- a/debian/libunwind-X.Y-dev.links.in +++ b/debian/libunwind-X.Y-dev.links.in @@ -1,2 +0,0 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so /usr/lib/x86_64-linux-gnu/libunwind.so -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a /usr/lib/x86_64-linux-gnu/libunwind.a diff --git a/debian/libunwind-X.Y-dev.lintian-overrides.in b/debian/libunwind-X.Y-dev.lintian-overrides.in index 6a504f74..a082322a 100644 --- a/debian/libunwind-X.Y-dev.lintian-overrides.in +++ b/debian/libunwind-X.Y-dev.lintian-overrides.in @@ -1 +1 @@ -libunwind-@LLVM_VERSION@-dev: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.a +libunwind-@LLVM_VERSION@-dev: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.a diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Y.install.in index e26306e4..9857c78a 100644 --- a/debian/libunwind-X.Y.install.in +++ b/debian/libunwind-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.* +usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so.* diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Y.links.in index 663613ef..e69de29b 100644 --- a/debian/libunwind-X.Y.links.in +++ b/debian/libunwind-X.Y.links.in @@ -1,2 +0,0 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 -usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libunwind.so.1 diff --git a/debian/libunwind-X.Y.lintian-overrides.in b/debian/libunwind-X.Y.lintian-overrides.in index 0570c00a..13e333e4 100644 --- a/debian/libunwind-X.Y.lintian-overrides.in +++ b/debian/libunwind-X.Y.lintian-overrides.in @@ -1 +1 @@ -libunwind-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0 +libunwind-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/*/libunwind.so.1.0