From owner-svn-ports-all@freebsd.org Sun Feb 2 00:07:38 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0470923146A; Sun, 2 Feb 2020 00:07:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 489B9P5DjSz4FH5; Sun, 2 Feb 2020 00:07:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AEDAE71D0; Sun, 2 Feb 2020 00:07:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01207bHp077292; Sun, 2 Feb 2020 00:07:37 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01207bpd077291; Sun, 2 Feb 2020 00:07:37 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202002020007.01207bpd077291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 2 Feb 2020 00:07:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524794 - head/net-im/uTox X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/net-im/uTox X-SVN-Commit-Revision: 524794 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2020 00:07:38 -0000 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} \