From nobody Sun Nov 26 18:24:55 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 4SdcZb5cHSz52bC0; Sun, 26 Nov 2023 18:24:55 +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 4SdcZb51KZz4NNC; Sun, 26 Nov 2023 18:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023095; 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=hCpbkHSD42J8OAcjr8/FQ5P0Af1YPzNS3rHn4wXP64k=; b=W+UatwZZLT+hdHd7lC/LbehA/05X/9N5g858Y4q2RPCRXgPzFK41+Tt8GRZHE6hjGx8Xpf kSoIeAsdiIYWknV+gMnOX/GTLf8+jNCxLAHZWOFIStcayL5YM6NOu8NAHiE0G8VJxZvmhW /gScbPbZyKU7EuMUtWZO0MV48+vVmIoR7ZCVfUabe0qzZ5QeUux0evuh1UooiJQwPgqtsh xVqJAEyXxOcn559fPUIOLc5ooJIsLABK1T4CBkJ10BvV9QU1QEl7V2vXHMCJ15HImp0x1N Lao20Q0wufF5Ek3t+jhZXHs8Zbu6yG68JeG8/FBTDQemWe9ZJia5NEdIYJJsjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701023095; 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=hCpbkHSD42J8OAcjr8/FQ5P0Af1YPzNS3rHn4wXP64k=; b=IH1NTNBwEDRCKQgjae07LgCte0KuuKx3rxWJmhbzzoJ4fRs8oh7Nfz1XR/sG30j0iDnXkQ nmpjAmZeQVbwKcDnTdoV5jVUUsd6MS93S4eZ5N+pySCkqKP8hZDrc/KFdj/9ds8/tjQrzY nJXTX4fOP9FMWiv5ft9kN7TGLFIrr4uUn+r+BAYLc0cbqeuNzDpCbAeYPRQSvCFCBZi0Jw FlPlWKymEREqNU1C5rL6Bcwcplu2BuOYN4SRktOg2wau3tGMwUvQqG9eDK8DaAnuFiOWCw Yv9wnoxw13mQ9a4nNYooPwuVz6O1522FraANiWV1Za72sN0n12emdd6QeJD+Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701023095; a=rsa-sha256; cv=none; b=QUPDqRW/PuwW7aCQftdqhKAJr93qTtJd0QkfAcgPU6puPnCeg8R3dfbiKRKVmjOWmvDd+k O2DdOP1Nuu2/Abz/Wu9XCSp86SdUdCRlmVIJD9Mux7BBuoLUsMOBKsgHDOd1Dp7WTXsulM J+FbjXUMBpW9kDhy1xN2iSxitmk7uQlvZOACDYDFI/9nfDN6xepsWr4pMyIt2ViULiorVo UfYh3oYrTU4WxufEdY4RS8FBr2/RLtZTz6pWcZzqJbL6l5saJ3aqWk7hGPYz+f3Q6majjk dmpY/CELboiTU6IgqA/ZPI5GfXPztC1KFmKUPulE2/kwBagRjeMBNQ/P0dpTMA== 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 4SdcZb454Wz15cy; Sun, 26 Nov 2023 18:24:55 +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 3AQIOtgT063301; Sun, 26 Nov 2023 18:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQIOtd5063298; Sun, 26 Nov 2023 18:24:55 GMT (envelope-from git) Date: Sun, 26 Nov 2023 18:24:55 GMT Message-Id: <202311261824.3AQIOtd5063298@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: 50e1b669d76a - main - devel/libnotify: fix build with lld 17 (take 2) 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: 50e1b669d76a12aab4bc9646261cd426847dc825 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=50e1b669d76a12aab4bc9646261cd426847dc825 commit 50e1b669d76a12aab4bc9646261cd426847dc825 Author: Dimitry Andric AuthorDate: 2023-11-26 18:09:08 +0000 Commit: Dimitry Andric CommitDate: 2023-11-26 18:21:23 +0000 devel/libnotify: fix build with lld 17 (take 2) The fix for bug 274108 broke running the notify-send command, resulting in: ld-elf.so.1: /usr/local/lib/libglib-2.0.so.0: Undefined symbol "environ" This is because libnotify uses the same linker version script for both its libnotify.so shared library and for its notify-send executable. The linker version script places all symbols that do not begin with "notify_" into the local scope, making them effectively hidden. This is fine for a shared library, but not for an executable, since it will also hide the symbols "environ" and "__progname", which are required for most programs. Fix it by not using the linker version script for the notify-send executable, so no required symbols are hidden. PR: 275104, 274108 MFH: 2023Q4 --- devel/libnotify/files/patch-libnotify_meson.build | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/devel/libnotify/files/patch-libnotify_meson.build b/devel/libnotify/files/patch-libnotify_meson.build new file mode 100644 index 000000000000..18b4cdc232a0 --- /dev/null +++ b/devel/libnotify/files/patch-libnotify_meson.build @@ -0,0 +1,18 @@ +--- libnotify/meson.build.orig 2023-02-17 21:20:15 UTC ++++ libnotify/meson.build +@@ -46,7 +46,6 @@ notify_dep = declare_dependency( + dependencies: libnotify_deps, + compile_args: libnotify_cflags, + sources: headers + [enum_types[1]] + [marshal[1]], +- link_args: libnotify_ldflags, + ) + + libnotify_lib = shared_library(LIBNAME, +@@ -55,6 +54,7 @@ libnotify_lib = shared_library(LIBNAME, + version: '@0@.@1@.@2@'.format(LT_CURRENT, LT_REVISION, LT_AGE), + soversion: LT_CURRENT, + install: true, ++ link_args: libnotify_ldflags, + ) + + libnotify_dep = declare_dependency(