tfix INSTALL warnings - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 5d03af6557cc215cabc0f83a274d9add703f526e
(DIR) parent e42c27297abd4cb00704b9d0e7a3401114d34ebf
(HTM) Author: Russ Cox <rsc@swtch.com>
Date: Tue, 29 May 2012 15:11:14 -0400
fix INSTALL warnings
R=rsc
http://codereview.appspot.com/6258060
Diffstat:
M bin/9l | 9 +++++++--
M src/cmd/acid/expr.c | 1 -
M src/cmd/fontsrv/mkfile | 2 +-
A src/cmd/fontsrv/osx-cocoa.c | 1 +
M src/cmd/venti/srv/mkfile | 2 +-
M src/cmd/venti/srv/printarenapart.c | 3 ++-
M src/mkfile | 1 -
7 files changed, 12 insertions(+), 7 deletions(-)
---
(DIR) diff --git a/bin/9l b/bin/9l
t@@ -268,12 +268,17 @@ then
then
X11=/usr/X11R6
fi
+ # Don't say -L with a non-existent directory: Xcode complains.
# x86_64 seems to put its 64-bit libraries in lib64.
- if [ "${OBJTYPE:-`uname -m`}" = "x86_64" ]
+ if [ "${OBJTYPE:-`uname -m`}" = "x86_64" -a -d "$X11/lib64" ]
then
libsl="$libsl -L$X11/lib64"
fi
- libsl="$libsl -L$X11/lib -lX11"
+ if [ -d "$X11/lib" ]
+ then
+ libsl="$libsl -L$X11/lib"
+ fi
+ libsl="$libsl -lX11"
fi
fi
if $doautoframework
(DIR) diff --git a/src/cmd/acid/expr.c b/src/cmd/acid/expr.c
t@@ -1076,7 +1076,6 @@ acidregsrw(Regs *r, char *name, u64int *u, int isr)
Value *v;
Node *n;
u64int addr;
- u32int u32;
if(!isr){
werrstr("cannot write registers");
(DIR) diff --git a/src/cmd/fontsrv/mkfile b/src/cmd/fontsrv/mkfile
t@@ -11,4 +11,4 @@ OFILES=\
<$PLAN9/src/mkone
-
+osx-cocoa.$O: osx.c
(DIR) diff --git a/src/cmd/fontsrv/osx-cocoa.c b/src/cmd/fontsrv/osx-cocoa.c
t@@ -0,0 +1 @@
+#include "osx.c"
(DIR) diff --git a/src/cmd/venti/srv/mkfile b/src/cmd/venti/srv/mkfile
t@@ -89,7 +89,7 @@ $SLIB: $LIBOFILES
acid:D: lumpcache.acid
cat $prereq >$target
-$O.conf:D: conf.rc
+$O.conf:DQ: conf.rc
{
echo '#!/usr/local/plan9/bin/rc'
echo '# THIS FILE IS AUTOMATICALLY GENERATED'
(DIR) diff --git a/src/cmd/venti/srv/printarenapart.c b/src/cmd/venti/srv/printarenapart.c
t@@ -11,7 +11,8 @@ usage(void)
threadexitsall("usage");
}
-static void
+/* unused */
+void
rdarena(Arena *arena, u64int offset)
{
u64int a, aa, e;
(DIR) diff --git a/src/mkfile b/src/mkfile
t@@ -16,7 +16,6 @@ libs-%:V:
do
(cd $i; echo cd `pwd`';' mk $MKFLAGS $stem; mk $MKFLAGS $stem)
done
- [ "$SYSNAME" != Darwin ] || ranlib ../lib/*.a
MKDIRS=\
libbio\