diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /INSTALL | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'INSTALL')
| -rwxr-xr-x | INSTALL | 54 |
1 files changed, 28 insertions, 26 deletions
@@ -23,17 +23,6 @@ x-r) exit 1 esac -PLAN9=`pwd` export PLAN9 -PATH=/bin:/usr/bin:$PLAN9/bin:$PATH export PATH -case `uname` in -SunOS) - awk=nawk - ;; -*) - awk=awk - ;; -esac - echo "+ Mailing list: https://groups.google.com/group/plan9port-dev" echo "+ Issue tracker: https://github.com/9fans/plan9port/issues/" echo "+ Submitting changes: https://github.com/9fans/plan9port/pulls" @@ -41,30 +30,42 @@ echo " " echo "* Resetting $PLAN9/config" rm -f config -( -if [ `uname` = FreeBSD ]; then +PLAN9=`pwd` export PLAN9 +PATH=/bin:/usr/bin:$PLAN9/bin:$PATH export PATH +case `uname` in +SunOS) + 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 "* 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 + awk=awk + ;; +*) + awk=awk + ;; +esac +( if [ `uname` = Linux ]; then # On Linux, we use the kernel version to decide whether # 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. 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 \ + -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 if [ -f a.out ]; then echo " fontsrv dependencies found." |