tfontsrv: fix build on OpenBSD 5.2 - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 1a512ec048a5c607a01b9fd82561c1601ba87406
DIR parent 0b4fd921055175e9dda8c424f9252f4141507742
HTML Author: Christian Kellermann <ckeen@pestilenz.org>
Date: Tue, 11 Dec 2012 12:45:45 -0500
fontsrv: fix build on OpenBSD 5.2
R=rsc
CC=plan9port.codebot
https://codereview.appspot.com/6850108
Diffstat:
M CONTRIBUTORS | 1 +
M INSTALL | 5 +++++
M src/cmd/devdraw/mkwsysrules.sh | 1 +
M src/cmd/fontsrv/freetyperules.sh | 7 ++++++-
M src/cmd/fontsrv/mkfile | 2 +-
5 files changed, 14 insertions(+), 2 deletions(-)
---
DIR diff --git a/CONTRIBUTORS b/CONTRIBUTORS
t@@ -12,6 +12,7 @@ Anthony Sorace <a@9srv.net>
Arvindh Rajesh Tamilmani <art@a-30.net>
Benjamin Huntsman <BHuntsman@mail2.cu-portland.edu>
Caio Oliveira <cmarcelo@gmail.com>
+Christian Kellermann <ckeen@pestilenz.org>
Christopher Brannon <chris@the-brannons.com>
David du Colombier <0intro@gmail.com>
David Jeannot <djeannot24@gmail.com>
DIR diff --git a/INSTALL b/INSTALL
t@@ -45,6 +45,11 @@ rm -f config
echo "* Compiler version:"
9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/ /'
+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
# On Linux, we use the kernel version to decide whether
# to use pthreads or not. On 2.6 versions that aren't
DIR diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh
t@@ -45,6 +45,7 @@ fi
echo 'WSYSTYPE='$WSYSTYPE
echo 'X11='$X11
+echo 'X11H='$X11H
if [ $WSYSTYPE = x11 ]; then
echo 'CFLAGS=$CFLAGS '$X11H
DIR diff --git a/src/cmd/fontsrv/freetyperules.sh b/src/cmd/fontsrv/freetyperules.sh
t@@ -1,7 +1,12 @@
#!/bin/sh
if [ "x$1" = "xx11" ]; then
- echo 'CFLAGS=$CFLAGS -I/usr/include/freetype2'
+ if [ "x$2" = "x" ]; then
+ i=/usr/include
+ else
+ i=$2
+ fi
+ echo 'CFLAGS=$CFLAGS '$i'/freetype2'
echo 'LDFLAGS=$LDFLAGS -lfontconfig -lfreetype -lz'
fi
DIR diff --git a/src/cmd/fontsrv/mkfile b/src/cmd/fontsrv/mkfile
t@@ -1,6 +1,6 @@
<$PLAN9/src/mkhdr
<|sh ../devdraw/mkwsysrules.sh
-<|sh freetyperules.sh $WSYSTYPE
+<|sh freetyperules.sh $WSYSTYPE $X11H
TARG=fontsrv