Module Name: src
Committed By: mrg
Date: Mon Apr 12 03:57:07 UTC 2021
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
src/external/mit/ctwm/bin/ctwm: Makefile
src/external/mit/xorg/lib: libmesa.mk
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Makefile.servermod
src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib
Makefile.servermod
src/lib/libc/gen: Makefile.inc
Log Message:
use -fcommon where necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/ibm-public/postfix/Makefile.inc
cvs rdiff -u -r1.10 -r1.11 src/external/mit/ctwm/bin/ctwm/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \
src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
cvs rdiff -u -r1.210 -r1.211 src/lib/libc/gen/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.26 src/external/ibm-public/postfix/Makefile.inc:1.27
--- src/external/ibm-public/postfix/Makefile.inc:1.26 Thu Nov 12 17:53:43 2020
+++ src/external/ibm-public/postfix/Makefile.inc Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2020/11/12 17:53:43 nia Exp $
+# $NetBSD: Makefile.inc,v 1.27 2021/04/12 03:57:06 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,9 @@ WARNS?= 0
PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
+# Many issues need to be resolved.
+COPTS+= -fcommon
+
CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \
-I${DIST} \
-I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
Index: src/external/mit/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.10 src/external/mit/ctwm/bin/ctwm/Makefile:1.11
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.10 Sun Apr 11 10:52:16 2021
+++ src/external/mit/ctwm/bin/ctwm/Makefile Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/04/11 10:52:16 nia Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/12 03:57:06 mrg Exp $
.include <bsd.own.mk>
@@ -65,3 +65,5 @@ DPADD+= ${LIBXPM} ${LIBXMU} ${LIBXT} ${L
.include <bsd.files.mk>
.include <bsd.x11.mk>
.include <bsd.prog.mk>
+
+COPTS+= ${${ACTIVE_CC} == "gcc":? -fcommon :}
Index: src/external/mit/xorg/lib/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.13 src/external/mit/xorg/lib/libmesa.mk:1.14
--- src/external/mit/xorg/lib/libmesa.mk:1.13 Sat Oct 31 13:28:22 2020
+++ src/external/mit/xorg/lib/libmesa.mk Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.13 2020/10/31 13:28:22 nia Exp $
+# $NetBSD: libmesa.mk,v 1.14 2021/04/12 03:57:06 mrg Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -548,6 +548,6 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DYYTEXT_POINTER=1
-CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
+CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
.include "libGL/mesa-ver.mk"
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.26 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.27
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.26 Thu Jan 3 23:25:52 2019
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.26 2019/01/03 23:25:52 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.27 2021/04/12 03:57:06 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -49,6 +49,9 @@ CPPFLAGS+= -DPACKAGE_VERSION_MINOR=${PAC
CPPFLAGS+= -DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
+
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
.PATH: ${X11SRCDIR.${DRIVER}}
Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.12 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.13
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.12 Fri Aug 19 03:59:30 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.12 2016/08/19 03:59:30 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.13 2021/04/12 03:57:06 mrg Exp $
.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
@@ -28,3 +28,6 @@ CPPFLAGS+= -DGLAMOR
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.5 src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.6
--- src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.5 Mon Dec 31 11:14:03 2018
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.5 2018/12/31 11:14:03 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.6 2021/04/12 03:57:06 mrg Exp $
.include <bsd.own.mk> # For /etc/mk.conf processing
@@ -25,3 +25,6 @@ CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
CPPFLAGS+= ${X11FLAGS.DIX}
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.2
--- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.2 2021/04/12 03:57:06 mrg Exp $
.include <bsd.own.mk> # for NETBSDSRCDIR and mk.conf processing
@@ -24,3 +24,6 @@ CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.2
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Mon Apr 12 03:57:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.2 2021/04/12 03:57:06 mrg Exp $
.include <bsd.own.mk> # For /etc/mk.conf processing
@@ -23,3 +23,6 @@ moduleinstall::
.if defined(XMODULEDIR)
CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/lib/libc/gen/Makefile.inc
diff -u src/lib/libc/gen/Makefile.inc:1.210 src/lib/libc/gen/Makefile.inc:1.211
--- src/lib/libc/gen/Makefile.inc:1.210 Wed Mar 10 13:30:34 2021
+++ src/lib/libc/gen/Makefile.inc Mon Apr 12 03:57:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.210 2021/03/10 13:30:34 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.211 2021/04/12 03:57:07 mrg Exp $
# from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
# gen sources
@@ -211,3 +211,4 @@ CLEANFILES+= errlist.c
# Ownership of globals from crt0.o is shared with libc for historic reasons.
# __progname is also necessary as global here for the nbcompat case.
COPTS.getprogname.c+= -fcommon
+COPTS.setproctitle.c+= -fcommon
