Module Name: src
Committed By: riz
Date: Fri Apr 6 17:02:09 UTC 2012
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader [netbsd-6]:
Makefile
src/tests/lib/libppath [netbsd-6]: Makefile plist_to_c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #147):
tests/lib/libppath/Makefile: revision 1.4
external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:
revision 1.11
external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:
revision 1.12
tests/lib/libppath/plist_to_c: revision 1.2
Use :Q for quoting. Execute shell script using the host shell.
Use :Q for quoting. Execute shell script using the host shell.
Use toolchain awk to make them buildable on Solaris 10.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.4.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.3 -r1.3.2.1 src/tests/lib/libppath/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tests/lib/libppath/plist_to_c
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/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10.4.1
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.10 Tue Aug 2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Fri Apr 6 17:02:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2012/04/06 17:02:09 riz Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -48,10 +48,10 @@ CPPFLAGS.sdksyms.c= ${X11FLAGS.EXTENSION
#COPTS.sdksyms.c= -Wno-error
COPTS.loadmod.c= -Wno-error
-.include <bsd.x11.mk>
-.include <bsd.lib.mk>
-
sdksyms.c: sdksyms.sh
- CPP='$(CPP)' AWK='$(AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+ CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
sdksyms.d: sdksyms.c
CLEANFILES+= sdksyms.c
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/tests/lib/libppath/Makefile
diff -u src/tests/lib/libppath/Makefile:1.3 src/tests/lib/libppath/Makefile:1.3.2.1
--- src/tests/lib/libppath/Makefile:1.3 Fri Jan 20 15:06:47 2012
+++ src/tests/lib/libppath/Makefile Fri Apr 6 17:02:09 2012
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2012/01/20 15:06:47 tsutsui Exp $
+# $Id: Makefile,v 1.3.2.1 2012/04/06 17:02:09 riz Exp $
.include <bsd.own.mk>
@@ -16,7 +16,7 @@ CPPFLAGS+=-I$(.OBJDIR)
echo "extern const char " ${.TARGET:S,.h$,,} "[];" > ${.TARGET}
.plist.c:
- ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} < ${.IMPSRC} > ${.TARGET}
+ AWK=${TOOL_AWK:Q} ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} < ${.IMPSRC} > ${.TARGET}
CLEANFILES+=personnel.c personnel.h
Index: src/tests/lib/libppath/plist_to_c
diff -u src/tests/lib/libppath/plist_to_c:1.1 src/tests/lib/libppath/plist_to_c:1.1.4.1
--- src/tests/lib/libppath/plist_to_c:1.1 Thu Aug 25 19:09:46 2011
+++ src/tests/lib/libppath/plist_to_c Fri Apr 6 17:02:09 2012
@@ -12,7 +12,7 @@ if [ $# -ne 1 ]; then
fi
sed 's/\(["\]\)/\\\1/g' | \
-awk -v sym=$1 '
+${AWK:-awk} -v sym=$1 '
BEGIN { printf "const char " sym "[] = \""; }
{ printf $0 "\\n"; }
END { print "\";"; }'
