diff --git a/devel/bear/Makefile b/devel/bear/Makefile index 5edb1ee62fe4..c2ddb7e9d80f 100644 --- a/devel/bear/Makefile +++ b/devel/bear/Makefile @@ -1,43 +1,49 @@ # Created by: Jov PORTNAME= bear DISTVERSION= 3.0.13 PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jrm@FreeBSD.org COMMENT= Tool that generates a compilation database for clang tooling LICENSE= GPLv3+ BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libabsl_hash.so:devel/abseil \ libcares.so:dns/c-ares \ libfmt.so:devel/libfmt \ libgrpc.so:devel/grpc \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 \ libspdlog.so:devel/spdlog USES= cmake compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= rizsotto GH_PROJECT= Bear USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \ -DENABLE_FUNC_TESTS=OFF \ -DENABLE_UNIT_TESTS=OFF OPTIONS_DEFINE= DOCS +# Patch 11.x, which requires #define _WITH_DPRINTF +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-source_intercept_source_report_libexec_Logger.cc +.endif + + pre-install: ${MV} ${STAGEDIR}/${CONFIGURE_WRKSRC}/stage ${CONFIGURE_WRKSRC}/ ${RM} -r ${STAGEDIR}/wrkdirs post-install: .for l in bin/citnames bin/intercept libexec/bear/libexec.so libexec/bear/wrapper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${l} .endfor .include diff --git a/devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc b/devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc new file mode 100644 index 000000000000..91cdee1891a8 --- /dev/null +++ b/devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc @@ -0,0 +1,10 @@ +--- source/intercept/source/report/libexec/Logger.cc.orig 2021-07-22 21:19:02 UTC ++++ source/intercept/source/report/libexec/Logger.cc +@@ -20,6 +20,7 @@ + #include "report/libexec/Logger.h" + + #include ++#define _WITH_DPRINTF + #include + #include +