Date: Sun, 2 Feb 2020 00:07:37 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524794 - head/net-im/uTox Message-ID: <202002020007.01207bpd077291@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Feb 2 00:07:37 2020 New Revision: 524794 URL: https://svnweb.freebsd.org/changeset/ports/524794 Log: net-im/uTox: Remove LLD_UNSAFE ld.lld lacks default output emulation. Using -b binary without explicit -m will fail. Add arch-to-emulation mapping and unbreak build. Modified: head/net-im/uTox/Makefile Modified: head/net-im/uTox/Makefile ============================================================================== --- head/net-im/uTox/Makefile Sat Feb 1 23:55:10 2020 (r524793) +++ head/net-im/uTox/Makefile Sun Feb 2 00:07:37 2020 (r524794) @@ -31,8 +31,6 @@ USES= cmake compiler:c11 desktop-file-utils openal pk USE_XORG= ice sm x11 xext xrender CMAKE_OFF= ENABLE_LTO ENABLE_TESTS -# Uses ld -b binary without -m -LLD_UNSAFE= yes WRKSRC= ${WRKDIR}/uTox OPTIONS_DEFINE= DBUS @@ -41,6 +39,22 @@ OPTIONS_DEFAULT= DBUS DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS +.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld +# ld.lld lacks default output emulation. Using -b binary without +# explicit -m will fail. Mapping taken from lld/ELF/Driver.cpp. +_LLD_EMUL_aarch64= aarch64elf_fbsd +_LLD_EMUL_amd64= elf_x86_64_fbsd +_LLD_EMUL_armv6= armelf_fbsd +_LLD_EMUL_armv7= armelf_fbsd +_LLD_EMUL_i386= elf_i386_fbsd +_LLD_EMUL_powerpc= elf32ppc_fbsd +_LLD_EMUL_powerpc64= elf64ppc_fbsd + +post-patch: + @${REINPLACE_CMD} 's,[[:<:]]ld[[:>:]],ld -m${_LLD_EMUL_${ARCH}},' \ + ${WRKSRC}/src/xlib/CMakeLists.txt +.endif + do-test: @cd ${TEST_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002020007.01207bpd077291>