CVS commit: pkgsrc/mk/platform

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Nov  9 16:33:53 UTC 2023

Modified Files:
        pkgsrc/mk/platform: Darwin.mk

Log Message:
mk: Make multiple-definitions non-fatal for Darwin/powerpc ld(1).

Unfortunately too much modern software uses them.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/mk/platform/Darwin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/platform/Darwin.mk
diff -u pkgsrc/mk/platform/Darwin.mk:1.133 pkgsrc/mk/platform/Darwin.mk:1.134
--- pkgsrc/mk/platform/Darwin.mk:1.133  Thu Nov  9 08:47:42 2023
+++ pkgsrc/mk/platform/Darwin.mk        Thu Nov  9 16:33:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.133 2023/11/09 08:47:42 nia Exp $
+# $NetBSD: Darwin.mk,v 1.134 2023/11/09 16:33:53 nia Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -230,12 +230,18 @@ OPSYS_HAS_KQUEUE= # defined
 MAKE_ENV+=     MACOSX_DEPLOYMENT_TARGET="10.4"
 .endif
 
+.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc*)
 # Convert to flags that the old toolchain understands.
 #
 # XXX: probably applies to more platforms too, but the GCC docs
 # unhelpfully describe -pthread as a "HP-UX/Solaris flag" to this day
-.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc)
 BUILDLINK_TRANSFORM+=  opt:-pthread:-lpthread
+
+# unfortunately, many highly-depended-upon packages now include multiple
+# overlapping definitions. This changes them from an error to a warning.
+LDFLAGS+=              -Wl,-m
+CWRAPPERS_APPEND.ld+=  -m
+_WRAP_EXTRA_ARGS.LD+=  -m
 .endif
 
 # El Capitan GM has a file system bug where a deep directory hierarchy can be