Merge branch '12-fix-pc' into '12'

d/rules: Adjust cmake defines to fix libclc.pc paths

See merge request pkg-llvm-team/llvm-toolchain!70
This commit is contained in:
Sylvestre Ledru 2021-07-21 06:36:55 +00:00
commit d7240e1a38
2 changed files with 6 additions and 2 deletions

3
debian/changelog vendored
View File

@ -10,6 +10,9 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium
for llvm manifest tool (llvm-mt)
(Closes: #990537)
[ Jordan Justen ]
* d/rules: Adjust cmake defines to fix libclc.pc paths
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 12 Jul 2021 08:19:59 +0200
llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium

5
debian/rules vendored
View File

@ -523,8 +523,9 @@ debian-libclc-build:
echo "Using cmake: $$CMAKE_BIN"; \
cd libclc/build && \
$$CMAKE_BIN ../ \
-DCMAKE_INSTALL_DATADIR=/usr/lib \
-DCMAKE_INSTALL_INCLUDEDIR=/usr/include \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_DATADIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \
-DLLVM_CONFIG=$(CURDIR)/$(TARGET_BUILD_STAGE2)/bin/llvm-config \
-DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"; \
make $(NJOBS) $(VERBOSE)