tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: CVS commit: pkgsrc/audio/openal-soft



On Sun, Mar 30, 2025 at 09:33:26AM +0000, Nia Alarie wrote:
> Module Name:	pkgsrc
> Committed By:	nia
> Date:		Sun Mar 30 09:33:26 UTC 2025
> 
> Modified Files:
> 	pkgsrc/audio/openal-soft: buildlink3.mk
> 
> Log Message:
> openal-soft: Select a suitable version depending on the compiler.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/openal-soft/buildlink3.mk
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 

> Modified files:
> 
> Index: pkgsrc/audio/openal-soft/buildlink3.mk
> diff -u pkgsrc/audio/openal-soft/buildlink3.mk:1.2 pkgsrc/audio/openal-soft/buildlink3.mk:1.3
> --- pkgsrc/audio/openal-soft/buildlink3.mk:1.2	Mon Mar 24 09:32:38 2025
> +++ pkgsrc/audio/openal-soft/buildlink3.mk	Sun Mar 30 09:33:26 2025
> @@ -1,7 +1,19 @@
> -# $NetBSD: buildlink3.mk,v 1.2 2025/03/24 09:32:38 nia Exp $
> +# $NetBSD: buildlink3.mk,v 1.3 2025/03/30 09:33:26 nia Exp $
>  
>  BUILDLINK_TREE+=	openal-soft
>  
> +.include "../../mk/compiler.mk"
> +
> +.if !empty(CC_VERSION:Mgcc-4.*)
> +# this defines OPENAL_SOFT_BUILDLINK3_MK so the next sections aren't used
> +.  include "../../audio/openal-soft-c/buildlink3.mk"
> +.endif
> +
> +.if !empty(CC_VERSION:Mgcc-[56789].*) || \
> +    !empty(CC_VERSION:Mgcc-10.*) || !empty(CC_VERSION:Mgcc-11.*)
> +.  include "../../audio/openal-soft-cxx14/buildlink3.mk"
> +.endif
> +
>  .if !defined(OPENAL_SOFT_BUILDLINK3_MK)
>  OPENAL_SOFT_BUILDLINK3_MK:=
>  
> 


It looks like this causes problems when a package pulls in openal via
two different paths, and needs a newer gcc on one path.

We have new build failures that explicitly mention an openal* conflict:

https://releng.netbsd.org/pkgreports/shadow/HEAD/NetBSD-10.0-x86_64/20250403.0918/woof-15.2.0/depends.log

pkg_add: A different version of openal-soft-1.23.1 is already installed: openal-soft-1.24.2nb1
pkg_add: package `python312-3.12.9nb1' was already installed as dependency, now marked as installed manually
pkg_add: 1 package addition failed

https://releng.netbsd.org/pkgreports/shadow/HEAD/NetBSD-10.0-x86_64/20250403.0918/bulk-test-boost-20231230/depends.log

pkg_add: A different version of openal-soft-1.23.1 is already installed: openal-soft-1.24.2nb1
pkg_add: Can't install dependency openal-soft>=1.5.304<1.24.0


 Thomas



Home | Main Index | Thread Index | Old Index