Date: Sun, 25 Dec 2022 23:15:54 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 85d704c5f260 - main - audio/openal-soft: unbreak after 145ca5487348 Message-ID: <202212252315.2BPNFsEc000912@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=85d704c5f2603e9c196598b7a6cba6ecb58b20ae commit 85d704c5f2603e9c196598b7a6cba6ecb58b20ae Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2022-12-25 23:11:44 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2022-12-25 23:11:44 +0000 audio/openal-soft: unbreak after 145ca5487348 Unbreak build by moving bsd.port.pre.mk include to just before post-patch, and using bsd.port.post.mk at the end. PR: 268495 Reported by: fluffy Fixes: 145ca5487348 MFH: 2022Q4 --- audio/openal-soft/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile index 0ff75a86b989..72b7b42d03dd 100644 --- a/audio/openal-soft/Makefile +++ b/audio/openal-soft/Makefile @@ -23,16 +23,6 @@ CMAKE_ON= ALSOFT_BACKEND_WAVE LDFLAGS+= -Wl,--as-needed LDFLAGS_i386= -Wl,-z,notext -.include <bsd.port.pre.mk> - -# The following is actually meant for lld 15.0 and later, but the ports -# framework does not support LINKER_TYPE and LINKER_VERSION yet. -.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 -# Turn off checking of dynamic relocations, to avoid lld diagnostics about -# possibly incorrect addend values. -LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations -.endif - PLIST_SUB= SOVERSION=${PORTVERSION} OPTIONS_DEFINE= CONFIG EXAMPLES JACK OSS PORTAUDIO PULSEAUDIO \ @@ -69,6 +59,16 @@ SNDIO_CMAKE_BOOL= ALSOFT_BACKEND_SNDIO ALSOFT_REQUIRE_SNDIO UTILS_LIB_DEPENDS= libmysofa.so:audio/libmysofa UTILS_CMAKE_BOOL= ALSOFT_UTILS +.include <bsd.port.pre.mk> + +# The following is actually meant for lld 15.0 and later, but the ports +# framework does not support LINKER_TYPE and LINKER_VERSION yet. +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 +# Turn off checking of dynamic relocations, to avoid lld diagnostics about +# possibly incorrect addend values. +LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations +.endif + post-patch: @${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \ ${WRKSRC}/alc/alconfig.cpp @@ -77,4 +77,4 @@ post-install-EXAMPLES-on: (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212252315.2BPNFsEc000912>