git: d2a712f7c12a - main - devel/android-tools-simpleperf: lock llvm-version at 9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 17 Dec 2022 23:13:16 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d2a712f7c12ae14b03c48b4098a7d84d6b0744ca
commit d2a712f7c12ae14b03c48b4098a7d84d6b0744ca
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-12-17 20:28:23 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-12-17 23:10:10 +0000
devel/android-tools-simpleperf: lock llvm-version at 9
LLVM_DEFAULT will be bumped to 15, this port fails with:
[...]
/usr/local/llvm15/include/llvm/ADT/STLForwardCompat.h:74:21:
error: no template named 'remove_cv_t' i n namespace 'std'; did
you mean 'remove_cv'?
using type = std::remove_cv_t<std::remove_reference_t<T>>;
~~~~~^~~~~~~~~~~
remove_cv
[...]
PR: 263456
---
devel/android-tools-simpleperf/Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/devel/android-tools-simpleperf/Makefile b/devel/android-tools-simpleperf/Makefile
index 373151610ede..5abd82b4a1d6 100644
--- a/devel/android-tools-simpleperf/Makefile
+++ b/devel/android-tools-simpleperf/Makefile
@@ -10,19 +10,17 @@ WWW= https://developer.android.com/ndk/guides/simpleperf
LICENSE= APACHE20
-BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-
USE_GITHUB= yes
GH_TUPLE= jbeich:platform_system_extras:${DISTVERSIONFULL} \
aosp-mirror:platform_system_core:${DISTVERSIONFULL}:core \
aosp-mirror:platform_bionic:${DISTVERSIONFULL}:bionic/bionic
-USES= compiler:c++11-lib ncurses uidfix
+USES= compiler:c++11-lib llvm:max=9,build ncurses uidfix
BUILD_WRKSRC= ${WRKSRC}/simpleperf
INSTALL_WRKSRC= ${BUILD_WRKSRC}
TEST_WRKSRC= ${BUILD_WRKSRC}
MAKEFILE= ${FILESDIR}/Makefile
-MAKE_ENV= BINDIR="${PREFIX}/bin" LLVM_CONFIG="llvm-config${LLVM_DEFAULT}"
+MAKE_ENV= BINDIR="${PREFIX}/bin" LLVM_CONFIG=${LLVM_CONFIG}
ALL_TARGET= all
TEST_TARGET= test
LDFLAGS+= -Wl,--as-needed # avoid overlinking (llvm deps)