databases/xtrabackup: fix build on the i386 platform

- Copy fix from the databases/mysql57-server to fix boost compliation
- Remove all clang workaround as not needed anymore
This commit is contained in:
Oleksii Samorukov 2023-06-06 06:56:40 +02:00
parent d9c7bd9254
commit fcc69d2102

View file

@ -42,20 +42,13 @@ PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \
bin/xbcloud bin/xbcloud_osenv bin/xbcloud bin/xbcloud_osenv
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
# xtrabackup/mysql57 fails to compile with llvm11, which was imported to current in r364284
# without a version increase (1300109 = r364274).
# Until a proper fix is provided, simply use llvm from ports, which probably could be
# a backport of amongst other tings:
# https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
_LLVM_VERSION= 10
BUILD_DEPENDS+= clang${_LLVM_VERSION}:devel/llvm${_LLVM_VERSION}
CC= ${LOCALBASE}/bin/clang${_LLVM_VERSION}
CXX= ${LOCALBASE}/bin/clang++${_LLVM_VERSION}
.endif
# Not sure why it's trying to install mysql client libraries now # Not sure why it's trying to install mysql client libraries now
post-install: post-install:
${RM} -rf ${STAGEDIR}${LOCALBASE}/lib ${RM} -rf ${STAGEDIR}${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|__clang__|__undefined__|g' \
${WRKDIR}/boost_1_59_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp
.include <bsd.port.post.mk> .include <bsd.port.post.mk>