tech-pkg archive

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

compiler.mk inclusion in buildlink3.mk causes problems



Hi!

These two patches introduce hard-to-diagnose problems in the bulk
builds.

The symptoms are here:
https://releng.netbsd.org/pkgreports/shadow/HEAD/NetBSD-10.0-x86_64/20250410.0811/blender-4.2.4nb2/configure.log

===> Creating toolchain wrappers for blender-4.2.4nb2
ERROR: gcc12-libs>=12.1.0 is not installed; can't buildlink files.
*** Error code 1

Same breakage in
https://releng.netbsd.org/pkgreports/shadow/HEAD/NetBSD-10.0-x86_64/20250410.0811/darktable-5.0.0nb3/configure.log (libheif)
https://releng.netbsd.org/pkgreports/shadow/HEAD/NetBSD-10.0-x86_64/20250410.0811/filelight-23.08.4nb7/configure.log (openal-soft)
https://releng.netbsd.org/pkgreports/shadow/HEAD/NetBSD-10.0-x86_64/20250410.0811/libksysguard-5.27.10nb7/configure.log (openal-soft)

graphics/vv is also affected, but not visible in the bulk builds
because it requires libjpeg-turbo.

I've diagnosed this by reverting the change for libheif - vv built
again. I assume that the openal-soft one with the same symptoms causes
the other fallout (haven't tested that yet).

Please fix the fallout, or revert the patches and find a different
solution for this problem.

Thanks,
 Thomas
--- Begin Message ---
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:=
 


--- End Message ---
--- Begin Message ---
Module Name:	pkgsrc
Committed By:	nia
Date:		Wed Apr  2 13:06:29 UTC 2025

Modified Files:
	pkgsrc/graphics/libheif: buildlink3.mk

Log Message:
libheif: Use an older version on systems without C++20 (most systems).


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/libheif/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/graphics/libheif/buildlink3.mk
diff -u pkgsrc/graphics/libheif/buildlink3.mk:1.12 pkgsrc/graphics/libheif/buildlink3.mk:1.13
--- pkgsrc/graphics/libheif/buildlink3.mk:1.12	Tue Mar 11 12:37:03 2025
+++ pkgsrc/graphics/libheif/buildlink3.mk	Wed Apr  2 13:06:29 2025
@@ -1,7 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2025/03/11 12:37:03 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2025/04/02 13:06:29 nia Exp $
 
 BUILDLINK_TREE+=	libheif
 
+.include "../../mk/compiler.mk"
+
+.if ${CC_VERSION:Mgcc-[3456789].*} || \
+    ${CC_VERSION:Mgcc-10.*} || ${CC_VERSION:Mgcc-11.*}
+# this defines LIBHEIF_BUILDLINK3_MK so the next sections aren't used
+.  include "../../graphics/libheif-cxx11/buildlink3.mk"
+.endif
+
 .if !defined(LIBHEIF_BUILDLINK3_MK)
 LIBHEIF_BUILDLINK3_MK:=
 


--- End Message ---


Home | Main Index | Thread Index | Old Index