From nobody Fri Oct 06 17:51:01 2023 X-Original-To: dev-commits-ports-all@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 4S2GF13gWjz4w0Ql; Fri, 6 Oct 2023 17:51:01 +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 4S2GF12Tydz4d16; Fri, 6 Oct 2023 17:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696614661; 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=1KNXYfwM7J2/yrIBOEmnvpbggcldgBoA8yCoX88e81k=; b=OwTIPHB9526RAIkg/Ew2dK2TRqkkjOHNJWySJGDv2r/lBCXlN9r4uIXD2gMMsgyOz2EDCy ApuP67T8z6LItvYoiaRdr5NMiT7VISeS7qjs0bangXwDjbu5kUSd0PTJLmRBevpS83EVH1 AH1vTvL4uNJdjVc8JoD3iHqLI+rfceSHQC+lsxysrONUNDY71MInXhAwI/ydGXBMoX9dLe WRADu4ryh++HzXeNYNHIeoN+3Q36I5aHCkkI/dPMbu0caflFSD7O43LUuGJo6zi1QUAuF6 d2vDq+AlEw44hOm8cgwbBA9MTwVgx8gXQB7U1y4IjS1NKZ5qENk4d8fY3CAz9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696614661; a=rsa-sha256; cv=none; b=yfBGvyPhTTkKJaPH2XV1dbpJqDqhnlNxWJGNoBi32Ao/ulYSFxfm9KnwaHDKiAFm4wEO+F jX67nQ8FTNmnyU9FoeIpw8o+Xg5KbNK3OxZgnfTbw4bxAj3FWJezD+Ktd9K88PxAL6Nr0F G9ZwkZwrHKnjqzXdCdXD1Arx4R1zimc092waWvTN8pEjCvhnxZb+Vtf02FPwLwAA/HPBN8 qBPUwU/7GgJ+XyfBI+I7JT9jOlLrlAFknYibolnrdUKg7q4cCxU+Xg1lB5+sdqpn4Pvccf hE524jc9QGjBPWP7C5zV3ZNmVnCrDIuz/UKFVe4SIHxNa5YIgs3ZRdHDmvFEtg== 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=1696614661; 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=1KNXYfwM7J2/yrIBOEmnvpbggcldgBoA8yCoX88e81k=; b=VuMKI5kbJBABvS9KgySD4qpSQTQD8g/M0PCYi93jcn7IrgDkT33Wpbq0Dw8mEU67dsHk89 IuP5AgAmrvQn32qddyBfWveQ53NY53C5iCx6ToiUf5jdzDaOEPzfHjOXDTetLJxaI79WNP uOcGOsXatMebYzezu2ISD0pmCS0RibvehB0eDIEc3i4l1mNCegcyYCKNbOrC+URaJO8w9K b10e8VCNpOhmspXER1PQKvyZ2OHXqgL9WtkUaEgX0YhU4ShEeLv4HAax3i4PoWLRdWeizB /bXtbeU7bpI9DJt2TUKMll7hsSpSo4G+/n4h/dAjWr7oTo2vImkN8GHm/jUbEg== 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 4S2GF11SmszxZH; Fri, 6 Oct 2023 17:51:01 +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 396Hp19u039435; Fri, 6 Oct 2023 17:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396Hp1X6039432; Fri, 6 Oct 2023 17:51:01 GMT (envelope-from git) Date: Fri, 6 Oct 2023 17:51:01 GMT Message-Id: <202310061751.396Hp1X6039432@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: 86f04dd9a2c5 - main - audio/pulseaudio: fix build with lld 17 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 86f04dd9a2c58f159b050b6043b919da2d120e6f Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=86f04dd9a2c58f159b050b6043b919da2d120e6f commit 86f04dd9a2c58f159b050b6043b919da2d120e6f Author: Dimitry Andric AuthorDate: 2023-09-26 18:54:05 +0000 Commit: Dimitry Andric CommitDate: 2023-10-06 17:48:54 +0000 audio/pulseaudio: fix build with lld 17 Building audio/pulseaudio with lld 17 results in the following link errors: cc -o src/pulse/libpulse.so.0.24.2 src/pulse/libpulse.so.0.24.2.p/channelmap.c.o src/pulse/libpulse.so.0.24.2.p/context.c.o src/pulse/libpulse.so.0.24.2.p/direction.c.o src/pulse/libpulse.so.0.24.2.p/error.c.o src/pulse/libpulse.so.0.24.2.p/ext-device-manager.c.o src/pulse/libpulse.so.0.24.2.p/ext-device-restore.c.o src/pulse/libpulse.so.0.24.2.p/ext-stream-restore.c.o src/pulse/libpulse.so.0.24.2.p/format.c.o src/pulse/libpulse.so.0.24.2.p/introspect.c.o src/pulse/libpulse.so.0.24.2.p/mainloop-api.c.o src/pulse/libpulse.so.0.24.2.p/mainloop-signal.c.o src/pulse/libpulse.so.0.24.2.p/mainloop.c.o src/pulse/libpulse.so.0.24.2.p/operation.c.o src/pulse/libpulse.so.0.24.2.p/proplist.c.o src/pulse/libpulse.so.0.24.2.p/rtclock.c.o src/pulse/libpulse.so.0.24.2.p/sample.c.o src/pulse/libpulse.so.0.24.2.p/scache.c.o src/pulse/libpulse.so.0.24.2.p/stream.c.o src/pulse/libpulse.so.0.24.2.p/subscribe.c.o src/pulse/libpulse.so.0.24.2.p/thread-mainloop.c.o src/pulse/libpulse.so.0.24.2.p/tim eval.c.o src/pulse/libpulse.so.0.24.2.p/utf8.c.o src/pulse/libpulse.so.0.24.2.p/util.c.o src/pulse/libpulse.so.0.24.2.p/volume.c.o src/pulse/libpulse.so.0.24.2.p/xmalloc.c.o -L/usr/local/lib -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group -Wl,-soname,libpulse.so.0 -fstack-protector-strong -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -DLIBICONV_PLUG -isystem /usr/local/include '-Wl,-rpath,$ORIGIN/..:/usr/local/lib' -Wl,-rpath-link,/wrkdirs/share/dim/ports/audio/pulseaudio/work/pulseaudio-16.1/_build/src -Wl,-rpath-link,/usr/local/lib src/libpulsecommon-16.1.so -Wl,-z,nodelete -Wl,-version-script=/wrkdirs/share/dim/ports/audio/pulseaudio/work/pulseaudio-16.1/src/pulse/map-file -lm -pthread /usr/local/lib/libdbus-1.so -ldl -lintl -Wl,--end-group ld: error: version script assignment of 'PULSE_0' to symbol 'pa_glib_mainloop_free' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_glib_mainloop_get_api' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_glib_mainloop_new' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_simple_drain' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_simple_flush' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_simple_free' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_simple_get_latency' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_simple_new' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_simple_read' failed: symbol not defined ld: error: version script assignment of 'PULSE_0' to symbol 'pa_simple_write' failed: symbol not defined cc: error: linker command failed with exit code 1 (use -v to see invocation) This is because lld 17 defaults to errors when undefined symbols are referenced in linker version scripts. Since pulseaudio uses the same linker version script for both the regular libpulse.so, and the other variants, libpulse-mainloop-glib.so and libpulse-simple.so, some of the symbols are expected to be undefined, so suppress the errors by adding -Wl,--undefined-version to LDFLAGS. PR: 274111 Approved by: blanket (for desktop and kde) MFH: 2023Q4 --- audio/pulseaudio/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index d1a5078aeaa3..f4060e63407e 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -29,6 +29,11 @@ USES= compiler:c11 cpe gettext-tools gmake gnome iconv localbase:ldflags \ USE_GNOME= glib20 USE_LDCONFIG= yes +# Some symbols in the linker version script map-file are only defined when +# building the mainloop-glib shared library. Suppress errors with lld >= 17 due +# to these undefined symbols. +LDFLAGS+= -Wl,--undefined-version + SHEBANG_FILES= shell-completion/bash/pactl \ src/utils/pa-info \ src/utils/qpaeq