From nobody Sun Dec 25 23:15:54 2022 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 4NgGxQ3rQRz1LdqN; Sun, 25 Dec 2022 23:15:54 +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 4NgGxQ3KsCz4JsP; Sun, 25 Dec 2022 23:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672010154; 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=trJqirkrl1hZ1F27pXJjI+dVxIde0GNClGQcIZ5DHxk=; b=Fwq4gDjLa05DTrdYiNtgG6GiqEVqDX6c3vS3nH5cHboVp/jXa9/DSNaqtYVJZCQU89+cBh H7rTXKfrAaGKrZK11TAcQ8yT3RDaJ38OCkEFIaBGFKKakXUzTrGy+ItdLEWHNnuZZTDJsd edcKZ3c60XGFH6sx52VvCzz89Z3v6aggR/YA451wreKlBnRP1zk7+Gmf7MNXvVWcNt1s+U Ua01gTcK/K2vKwi+lIndvbGuodaWN7dC7BEtzj/1IeulkSWSeYXyabF9frA27gLcXKUasH bvdqNtiSzyNLZKeQAfyl5vRNHdCTIH7T6C8HL1TF5N+aPF8FXDaLRXqZvBjsIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672010154; 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=trJqirkrl1hZ1F27pXJjI+dVxIde0GNClGQcIZ5DHxk=; b=Osr2FvdWiMoVXYlJZBqRmtM3UAEOXXf1NVXco9y1Vq7ywC5vm0YMKSI6EaVC5yAlCpKWA+ yUBrKR5guOn2b4BWiSxrlIa+7OpRX3liQijpnvyna9dUu/I8G9KqTq/ajoE4pLh9hHBgz5 FhVlUPCnnbhGmiTp0cj+raATINwa3iC3kxJnTIWPKOZvQOXGVgBjbTLSaY818gxe4zRMjU gQ5tx2lEOtpn7UOcwEtYdvdQpm/HX2mgNX0KUus2q0mDXFNx8xSTRU8bkPBIC3Q2hnWbmB D0UHlzX87CinxVdTNzlOMfFyOtXXA6Rj0XuRZn5IO+S5QO/P1ndqxKD22lrZfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672010154; a=rsa-sha256; cv=none; b=tMIphacyil8tXKx6gmYw/K5Zqkr8rkOXl80AhnKe+Njk22sxO1bRqK4GkX8pMXlaMKO4Hj fptfAr2rbF6SUV6CavngRLH5zvuchDtCCCrgbwfI8nMFy6Jb7OqkfuhqAyx2xlFcoive/q EjoOM9eswj2yaMXLGTtEkFwVREanU3KMNZKf2MJwTs94kNdC91ur2QzefnC8nDixYY32tM BuRwz3dmwCRQLUNwdQEqXDP0HVgR733PdOdHPsSa/VH7LJSMm6OetaLND2m84M4A2Q2tZZ 1RVt3S94vxRTSO5jnrgpUuEgAalb/nd2WN4NF5lBZlgrcLz0MPzWI2ukC37ffA== 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 4NgGxQ2Gpgz18T8; Sun, 25 Dec 2022 23:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BPNFsME000913; Sun, 25 Dec 2022 23:15:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BPNFsEc000912; Sun, 25 Dec 2022 23:15:54 GMT (envelope-from git) Date: Sun, 25 Dec 2022 23:15:54 GMT Message-Id: <202212252315.2BPNFsEc000912@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: 85d704c5f260 - main - audio/openal-soft: unbreak after 145ca5487348 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: 85d704c5f2603e9c196598b7a6cba6ecb58b20ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=85d704c5f2603e9c196598b7a6cba6ecb58b20ae commit 85d704c5f2603e9c196598b7a6cba6ecb58b20ae Author: Dimitry Andric AuthorDate: 2022-12-25 23:11:44 +0000 Commit: Dimitry Andric 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 - -# 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 + +# 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 +.include