Skip to content

Commit

Permalink
net-im/libquotient: Fix logic in patch-lib_qt__connection__util.h
Browse files Browse the repository at this point in the history
Follow-up to commit e7f65a5 ("net-im/libquotient: Fix the build on
FreeBSD releases with LLVM < 14"). The `#ifdef` logic added there was
slightly wrong, and we were basically disabling that code path even when
it was supposed to work.

Add a missing set of parentheses to fix the issue.

This has been tested on 12.4-i386, 13.2-amd64 and 14-amd64.

MFH:		2023Q3
  • Loading branch information
rakuco committed Jul 16, 2023
1 parent 7d4be2d commit 36ca9e3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion net-im/libquotient/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libquotient
DISTVERSION= 0.7.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-im

MAINTAINER= adridg@FreeBSD.org
Expand Down
2 changes: 1 addition & 1 deletion net-im/libquotient/files/patch-lib_qt__connection__util.h
Expand Up @@ -44,7 +44,7 @@ In file included from /usr/include/c++/v1/__functional/bind_front.h:14:
auto&& boundSlot =
-# if __cpp_lib_bind_front // Needs Apple Clang 13 (other platforms are fine)
+# if __cpp_lib_bind_front && \
+ !defined(__FreeBSD_version) || __FreeBSD_version >= 1301504
+ (!defined(__FreeBSD_version) || __FreeBSD_version >= 1301504)
+ // This requires LLVM >= 14, this only works with libc++ commit
+ // https://reviews.llvm.org/D107199.
std::bind_front(slot, context);
Expand Down

0 comments on commit 36ca9e3

Please sign in to comment.