From e001f3ee5b4615b4cc2bf23cc9015a362b889384 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sat, 10 Jul 2021 01:44:04 -0700 Subject: [PATCH] d/rules: Adjust cmake defines to fix libclc.pc paths Before this change, /usr/lib/pkgconfig/libclc.pc contained these invalid paths: includedir=/usr/local//usr/include libexecdir=/usr/local//usr/lib/clc Signed-off-by: Jordan Justen --- debian/changelog | 3 +++ debian/rules | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3fdda52f..3df48424 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 12 Jul 2021 08:19:59 +0200 llvm-toolchain-12 (1:12.0.1-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index a5d9445e..1ccf2db6 100755 --- a/debian/rules +++ b/debian/rules @@ -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)