cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-24 11:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

INSTALL, 9c, 9l: improve handling of *BSD (#302)

Browse source
This commit is contained in:
Leonid Bobrov 2020-01-07 21:51:42 +02:00 committed by Dan Cross
parent 6f5bd96ed8
commit cf6b778799
3 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
INSTALL
View file

@ -29,6 +29,30 @@ case `uname` in
SunOS) SunOS)
awk=nawk awk=nawk
;; ;;
DragonFly|*BSD)
case `cc -v 2>&1` in
*clang*)
echo "CC9=clang" >> $PLAN9/config
;;
*gcc*)
echo "CC9=gcc" >> $PLAN9/config
;;
esac
echo "* Running on" `uname`", adjusting linker flags"
case `uname` in
OpenBSD)
echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config
;;
NetBSD)
echo "LDFLAGS='-L/usr/X11R7/lib -pthread'" >> $PLAN9/config
;;
*)
echo "LDFLAGS='-L/usr/local/lib -pthread'" >> $PLAN9/config
;;
esac
echo "CFLAGS='-pthread'" >> $PLAN9/config
awk=awk
;;
*) *)
awk=awk awk=awk
;; ;;
@ -42,29 +66,6 @@ echo "* Resetting $PLAN9/config"
rm -f config rm -f config
( (
if [ `uname` = FreeBSD ]; then
case `cc -v 2>&1` in
*clang*)
echo "CC9=clang" >> $PLAN9/config
;;
*)
;;
esac
echo "* Running on FreeBSD, adjusting linker flags"
echo "LDFLAGS='-L/usr/local/lib'" >> $PLAN9/config
fi
if [ `uname` = DragonFly ]; then
echo "* Running on DragonFly BSD, adjusting linker flags"
echo "LDFLAGS='-L/usr/local/lib -pthread'" >> $PLAN9/config
echo "CFLAGS='-pthread'" >> $PLAN9/config
fi
if [ `uname` = OpenBSD ]; then
echo "* Running on OpenBSD, adjusting linker flags"
echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config
fi
if [ `uname` = Linux ]; then if [ `uname` = Linux ]; then
# On Linux, we use the kernel version to decide whether # On Linux, we use the kernel version to decide whether
# to use pthreads or not. On 2.6 versions that aren't # to use pthreads or not. On 2.6 versions that aren't
@ -135,6 +136,7 @@ if [ `uname` != Darwin ]; then
# Determine whether fontsrv X11 files are available. # Determine whether fontsrv X11 files are available.
rm -f a.out rm -f a.out
cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \ cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
-I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
-I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1 -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
if [ -f a.out ]; then if [ -f a.out ]; then
echo " fontsrv dependencies found." echo " fontsrv dependencies found."

5
bin/9c
View file

@ -79,9 +79,8 @@ useclang()
tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}-${CC9:-cc}" tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}-${CC9:-cc}"
case "$tag" in case "$tag" in
*FreeBSD*gcc*) usegcc ;; *(DragonFly|BSD)*gcc*) usegcc ;;
*FreeBSD*clang*) useclang ;; *(DragonFly|BSD)*clang*) useclang ;;
*DragonFly*|*BSD*) usegcc ;;
*Darwin-x86_64*) *Darwin-x86_64*)
useclang useclang
cflags="$ngflags -g3 -m64" cflags="$ngflags -g3 -m64"

13
bin/9l
View file

@ -11,19 +11,6 @@ nmflags=""
extralibs="-lm" extralibs="-lm"
tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}" tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
case "$tag" in case "$tag" in
*FreeBSD*)
ld=${CC9:-gcc}
userpath=true
extralibs="$extralibs -lutil"
case "`uname -r`" in
5.2.*)
extralibs="$extralibs -lkse"
;;
[5-9].*|1[0-9].*)
extralibs="$extralibs -lpthread"
;;
esac
;;
*DragonFly*|*BSD*) *DragonFly*|*BSD*)
ld=${CC9:-gcc} ld=${CC9:-gcc}
userpath=true userpath=true