CVS commit: src/external/mit/xorg/lib/libXaw
Module Name:src
Committed By: joerg
Date: Sun May 30 02:20:09 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile Makefile.common
Log Message:
Ignore pointer cast warnings for clang, too. Use -Wno-format more
selectively.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXaw/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.16 src/external/mit/xorg/lib/libXaw/Makefile:1.17
--- src/external/mit/xorg/lib/libXaw/Makefile:1.16 Mon Apr 26 21:53:53 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile Sun May 30 02:20:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2021/05/30 02:20:09 joerg Exp $
.include
@@ -66,5 +66,3 @@ X11EXTRAMANTRANSFORMS+= \
.include
.include
-
-CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/lib/libXaw/Makefile.common
diff -u src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 src/external/mit/xorg/lib/libXaw/Makefile.common:1.3
--- src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 Tue May 4 17:47:05 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile.common Sun May 30 02:20:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $
+# $NetBSD: Makefile.common,v 1.3 2021/05/30 02:20:09 joerg Exp $
CPPFLAGS+= -DHAVE_WCHAR_H \
-DHAVE_WCTYPE_H \
@@ -17,5 +17,8 @@ LIBDPLIBS=\
Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
+COPTS.Converters.c+= ${${ACTIVE_CC} == "clang":? -Wno-format :}
COPTS.Pixmap.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.Pixmap.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}
COPTS.TextAction.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.TextAction.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}
CVS commit: src/external/mit/xorg/lib/libXaw
Module Name:src
Committed By: rillig
Date: Tue May 4 17:47:05 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile.common
Log Message:
libXaw: fix Clang build
--- Pixmap.pico ---
error: unknown warning option '-Wno-discarded-qualifiers'; did you mean
'-Wno-ignored-qualifiers'? [-Werror,-Wunknown-warning-option]
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXaw/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXaw/Makefile.common
diff -u src/external/mit/xorg/lib/libXaw/Makefile.common:1.1 src/external/mit/xorg/lib/libXaw/Makefile.common:1.2
--- src/external/mit/xorg/lib/libXaw/Makefile.common:1.1 Mon Apr 26 21:53:53 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile.common Tue May 4 17:47:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2021/04/26 21:53:53 mrg Exp $
+# $NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $
CPPFLAGS+= -DHAVE_WCHAR_H \
-DHAVE_WCTYPE_H \
@@ -17,5 +17,5 @@ LIBDPLIBS=\
Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
-COPTS.Pixmap.c+= -Wno-discarded-qualifiers
-COPTS.TextAction.c+= -Wno-discarded-qualifiers
+COPTS.Pixmap.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.TextAction.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
CVS commit: src/external/mit/xorg/lib/libXaw
Module Name:src
Committed By: mrg
Date: Mon Apr 26 21:43:19 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile
Log Message:
define _CONST_X_STRING. avoid remaining const issues new libXt.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libXaw/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.14 src/external/mit/xorg/lib/libXaw/Makefile:1.15
--- src/external/mit/xorg/lib/libXaw/Makefile:1.14 Tue Jan 7 07:27:50 2020
+++ src/external/mit/xorg/lib/libXaw/Makefile Mon Apr 26 21:43:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/01/07 07:27:50 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2021/04/26 21:43:19 mrg Exp $
.include
@@ -53,6 +53,7 @@ INCSDIR=${X11INCDIR}/X11/Xaw
CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
CPPFLAGS+= -DHAVE_GETPAGESIZE
CPPFLAGS+= -DHAVE_UNISTD_H
+CPPFLAGS+= -D_CONST_X_STRING=1
CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\" -DXAW7
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xaw
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
@@ -76,3 +77,6 @@ X11EXTRAMANTRANSFORMS+= \
.include
CWARNFLAGS.clang+= -Wno-format
+
+COPTS.Pixmap.c+= -Wno-discarded-qualifiers
+COPTS.TextAction.c+= -Wno-discarded-qualifiers
CVS commit: src/external/mit/xorg/lib/libXaw
Module Name:src
Committed By: christos
Date: Sun May 15 21:05:13 UTC 2011
Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile
Log Message:
fix wide char support; don't use the wrong macro names.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libXaw/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.6 src/external/mit/xorg/lib/libXaw/Makefile:1.7
--- src/external/mit/xorg/lib/libXaw/Makefile:1.6 Mon Feb 21 00:09:53 2011
+++ src/external/mit/xorg/lib/libXaw/Makefile Sun May 15 17:05:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/02/21 05:09:53 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/05/15 21:05:12 christos Exp $
.include bsd.own.mk
@@ -50,7 +50,7 @@
INCSDIR=${X11INCDIR}/X11/Xaw
-CPPFLAGS+= -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
+CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
CPPFLAGS+= -DHAVE_GETPAGESIZE
CPPFLAGS+= -DPROJECT_ROOT=\${X11ROOTDIR}\ -DXAW7
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xaw
