From ceddcf42e840c81559348fd7a6f8b7f5255f384b Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 18 Mar 2022 21:41:23 +0900 Subject: [PATCH] qt-creator: Fix hardcoded paths in build.sh %ci:no-build --- x11-packages/qt-creator/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-packages/qt-creator/build.sh b/x11-packages/qt-creator/build.sh index c1ef1d6a6..c2acd341e 100644 --- a/x11-packages/qt-creator/build.sh +++ b/x11-packages/qt-creator/build.sh @@ -30,14 +30,14 @@ termux_step_post_configure() { # clangbackend's Makefile lacks -lc++_shared to link against libc++ on x86_64 sed -i -e 's|^LIBS = $(SUBLIBS)|LIBS = $(SUBLIBS) -lc++_shared|' \ - -e 's|-Wl,-rpath,/home/builder/.termux-build/_cache/android-r23b-api-24-v1/lib64||g' \ - -e 's|-L/home/builder/.termux-build/_cache/android-r23b-api-24-v1/lib64||g' \ + -e 's|-Wl,-rpath,'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \ + -e 's|-L'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \ ${TERMUX_PKG_SRCDIR}/src/tools/clangbackend/Makefile # make sure clangtools link against libc++_shared on x86_64 sed -i -e 's|^LIBS = $(SUBLIBS)|LIBS = $(SUBLIBS) -lc++_shared|' \ - -e 's|-Wl,-rpath,/home/builder/.termux-build/_cache/android-r23b-api-24-v1/lib64||g' \ - -e 's|-L/home/builder/.termux-build/_cache/android-r23b-api-24-v1/lib64||g' \ + -e 's|-Wl,-rpath,'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \ + -e 's|-L'${TERMUX_COMMON_CACHEDIR//./\\.}'/android-r[0-9][^/]*/lib64||g' \ ${TERMUX_PKG_SRCDIR}/src/plugins/clangtools/Makefile # required by make install, otherwise it installs to '/'