Source-Changes-HG archive

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

[src/trunk]: src Use toolchain awk to make them buildable on Solaris 10.



details:   https://anonhg.NetBSD.org/src/rev/27e7f56d4e42
branches:  trunk
changeset: 778119:27e7f56d4e42
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sat Mar 17 12:42:31 2012 +0000

description:
Use toolchain awk to make them buildable on Solaris 10.

diffstat:

 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile |  4 ++--
 tests/lib/libppath/Makefile                                     |  4 ++--
 tests/lib/libppath/plist_to_c                                   |  2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 600853c0bfcc -r 27e7f56d4e42 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile   Sat Mar 17 12:25:11 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile   Sat Mar 17 12:42:31 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2011/08/02 09:11:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2012/03/17 12:42:31 nakayama Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -52,6 +52,6 @@
 .include <bsd.lib.mk>
 
 sdksyms.c: sdksyms.sh
-       CPP='$(CPP)' AWK='$(AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+       CPP='$(CPP)' AWK='$(TOOL_AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
 sdksyms.d: sdksyms.c
 CLEANFILES+=   sdksyms.c
diff -r 600853c0bfcc -r 27e7f56d4e42 tests/lib/libppath/Makefile
--- a/tests/lib/libppath/Makefile       Sat Mar 17 12:25:11 2012 +0000
+++ b/tests/lib/libppath/Makefile       Sat Mar 17 12:42:31 2012 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2012/01/20 15:06:47 tsutsui Exp $
+# $Id: Makefile,v 1.4 2012/03/17 12:42:31 nakayama Exp $
 
 .include <bsd.own.mk>
 
@@ -16,7 +16,7 @@
        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
 
diff -r 600853c0bfcc -r 27e7f56d4e42 tests/lib/libppath/plist_to_c
--- a/tests/lib/libppath/plist_to_c     Sat Mar 17 12:25:11 2012 +0000
+++ b/tests/lib/libppath/plist_to_c     Sat Mar 17 12:42:31 2012 +0000
@@ -12,7 +12,7 @@
 fi
 
 sed 's/\(["\]\)/\\\1/g' | \
-awk -v sym=$1 '
+${AWK:-awk} -v sym=$1 '
 BEGIN  { printf "const char " sym "[] = \""; }
        { printf $0 "\\n"; }
 END    { print "\";"; }'



Home | Main Index | Thread Index | Old Index