From nobody Sat Oct 21 10:56:59 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCJLM2zNYz4xrwD; Sat, 21 Oct 2023 10:56:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SCJLM2SZYz3RhJ; Sat, 21 Oct 2023 10:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697885819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JampqrDmx/59R7euqM4vuSAsEwb/NeeFZ0Gzd/Svfxw=; b=FYmP4G5sFnACDy4Pzdmp330FMwlbH6i0c0RTYL9zkMKq7Fh8MlygsGF9WSZiMDNoJlgAyb Rm+Q15eGqbLHsNXIRbIECjW5CVmcRoDeWAxEVXUDvPg5MbIklkLuSzW8HQbZxvvWLBqAtG fj6s4N8t8Jit/euw8ILsUygEoRLxmertXw15Xwm527Dgzs0ImPIHGG7VOGtHzdBlrOQOP7 qvt854b2+uSE+WG1E4Y+ChMCoVM+/WjeyygTqMeE1olWxv33LQ3IdUsCTagsUQKjVFR0/F gEWnT4D57t8Mc8vrbKCa5txTimYAd/DCsz6GUwpsO5zfwbaLHecES+4Tjd2w0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697885819; a=rsa-sha256; cv=none; b=lLHZGIEnsXcWJ5cjE/KNZevHOdjleqMBpFwuvQ37v90arSrEhnpRi/1NRRmRZaEIUgISmy Dd/4F13k2HgITOgacjC51e7BnPbxktlR7Ex3JHljfbBxzS11An1gznwJYe6xALRypUGttC QeYsZoF9kr+qmlF0eJ5DdyeFZDwu4DxWHCF0gvHa+6r/cs2aOT53tjDgxIe5HXYuFXnTlT NNweGtxm8kLgTx//F7NAcaaUPbX9VNgQVN2Va4engZS2cwubcPkDq4B7eHGVkAEXhMzP/g 5cdLlgywW1Wy/odG3WO7XSsf+XdhIIisczncbh6ipPpmRW3fjhC17LTh5qeZcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697885819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JampqrDmx/59R7euqM4vuSAsEwb/NeeFZ0Gzd/Svfxw=; b=BVXQiu8NAGTENHHXnlJfOD/AH+4izy3uzHnooWf/6yBDhwCzJQH4uLHZI5yCBJ5tBbDJQB kCggPcSKziFxoWQV43ggzOUyXw4Ku0jx1QlEusApU9OPELa0TeClleL4kzq26KoDddfyvz tD1GQ8Y/THnR864M1+2dYMtDjVIBJ+c32I4ahYMyEmHHrIAMC0/sGKj2GTdutQ0tHsaVF4 DHAwOgQa4+t+7GRM9Wo8Vh220ANC+y8Cqfj3UZCVX6cnFlatmmY7FkbsjV0clKuv864tDK XjSkL7ydIfVA+2Nw15eI4XirRu6/K+lyaoqYe1fdteVI1UcdsMgJz2jCE6MWkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCJLM1MPMz1BTp; Sat, 21 Oct 2023 10:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39LAuxr4020888; Sat, 21 Oct 2023 10:56:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LAuxoo020885; Sat, 21 Oct 2023 10:56:59 GMT (envelope-from git) Date: Sat, 21 Oct 2023 10:56:59 GMT Message-Id: <202310211056.39LAuxoo020885@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: dee420703ee1 - main - graphics/libgphoto2: fix build with lld 17 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dee420703ee18ac8be9d10a488a3f650481aff78 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=dee420703ee18ac8be9d10a488a3f650481aff78 commit dee420703ee18ac8be9d10a488a3f650481aff78 Author: Dimitry Andric AuthorDate: 2023-10-07 14:54:00 +0000 Commit: Dimitry Andric CommitDate: 2023-10-21 10:52:22 +0000 graphics/libgphoto2: fix build with lld 17 Building graphics/libgphoto2 with lld 17 results in the following link error: libtool: link: cc -shared -fPIC -DPIC .libs/libgphoto2_port_la-gphoto2-port-info-list.o .libs/libgphoto2_port_la-gphoto2-port-log.o .libs/libgphoto2_port_la-gphoto2-port-version.o .libs/libgphoto2_port_la-gphoto2-port.o .libs/libgphoto2_port_la-gphoto2-port-portability.o .libs/libgphoto2_port_la-gphoto2-port-result.o -Wl,-rpath -Wl,/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -L/usr/local/lib /usr/local/lib/libltdl.so -lintl -lpthread -lregex -O2 -fstack-protector-strong -Wl,--version-script=./libgphoto2_port.ver -fstack-protector-strong -Wl,-rpath -Wl,/usr/local/lib -Wl,-soname -Wl,libgphoto2_port.so.12 -o .libs/libgphoto2_port.so.12.0.0 ld: error: version script assignment of 'LIBGPHOTO2_INTERNAL' to symbol 'gpi_gphoto_port_type_map' failed: symbol not defined cc: error: linker command failed with exit code 1 (use -v to see invocation) The mentioned symbol has been removed from libgphoto2 a long time ago, so remove it from the linker version script. PR: 274334 Approved by: maintainer timeout (2 weeks) MFH: 2023Q4 --- ...atch-libgphoto2__port_libgphoto2__port_libgphoto2__port.ver | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/graphics/libgphoto2/files/patch-libgphoto2__port_libgphoto2__port_libgphoto2__port.ver b/graphics/libgphoto2/files/patch-libgphoto2__port_libgphoto2__port_libgphoto2__port.ver new file mode 100644 index 000000000000..cec70d8e0ad5 --- /dev/null +++ b/graphics/libgphoto2/files/patch-libgphoto2__port_libgphoto2__port_libgphoto2__port.ver @@ -0,0 +1,10 @@ +--- libgphoto2_port/libgphoto2_port/libgphoto2_port.ver.orig 2019-02-05 07:18:06 UTC ++++ libgphoto2_port/libgphoto2_port/libgphoto2_port.ver +@@ -70,7 +70,6 @@ LIBGPHOTO2_INTERNAL { + + # These are only supposed to be used by libgphoto2 internally. + LIBGPHOTO2_INTERNAL { +- gpi_gphoto_port_type_map; + gpi_enum_to_string; + gpi_string_to_enum; + gpi_string_to_flag;