fix build on mips64.

no bump, because !mips64 packages didn't change, and mips64 didn't package.

ok mbalmer@
This commit is contained in:
jasper 2008-01-30 14:04:18 +00:00
parent 8a49c69df9
commit cdfdc7d815
2 changed files with 25 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2007/09/15 21:40:01 simon Exp $
# $OpenBSD: Makefile,v 1.20 2008/01/30 14:04:18 jasper Exp $
COMMENT= chinese input utility for X
@ -24,7 +24,12 @@ CONFIGURE_ARGS= --os=OpenBSD --no-menu
NO_REGRESS= Yes
MAKE_FLAGS= CC='${CC}' CFLAGS='${CFLAGS}'
# gcc 3.3.5 internal compiler error
.if ${MACHINE_ARCH} == "mips64"
EXTRA_CFLAGS= -O0
.endif
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" EXTRA_CFLAGS="${EXTRA_CFLAGS}"
CINS= cj.cin cj.tab cj.tab.rev phone.tab phone.cin phone.tab phone.tab.rev \
pinyin.cin pinyin.tab pinyin.tab.rev array30.cin array30.tab \
@ -35,14 +40,14 @@ BINS= cin2tab et.kbm et26.kbm hsu.kbm lphrase phs_out pho.sel1st \
tsin tsin.idx tsin.rel tsin_pin.map tsin.rel.src tsin.src \
voca.box zo.kbm
post-configure:
mv ${WRKSRC}/config.status ${WRKSRC}/config.status.orig
sed -e '/OPT_XCIN_CFONT/s/=.*/=-taipei-ming-medium-r-normal--16-160-75-75-c-160-big5-0/' -e '/OPT_XCIN_EFONT/s/=.*/=8x16/' ${WRKSRC}/config.status.orig > ${WRKSRC}/config.status
post-extract:
mv ${WRKSRC}/script/os_def/FreeBSD ${WRKSRC}/script/os_def/FreeBSD.orig
sed -e '/OS/s/=.*/=OpenBSD/' -e '/CFLAGS/s/=.*/=-O2/' ${WRKSRC}/script/os_def/FreeBSD.orig > ${WRKSRC}/script/os_def/OpenBSD
post-configure:
mv ${WRKSRC}/config.status ${WRKSRC}/config.status.orig
sed -e '/OPT_XCIN_CFONT/s/=.*/=-taipei-ming-medium-r-normal--16-160-75-75-c-160-big5-0/' -e '/OPT_XCIN_EFONT/s/=.*/=8x16/' ${WRKSRC}/config.status.orig > ${WRKSRC}/config.status
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/xcin/docs

View File

@ -1,7 +1,17 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2007/12/28 13:47:21 espie Exp $
$OpenBSD: patch-src_Makefile_in,v 1.3 2008/01/30 14:04:18 jasper Exp $
--- src/Makefile.in.orig Wed Feb 24 09:30:33 1999
+++ src/Makefile.in Fri Dec 28 14:45:27 2007
@@ -53,14 +53,18 @@ xcin: $(OBJS1) $(OBJS2)
+++ src/Makefile.in Tue Jan 29 19:11:15 2008
@@ -41,6 +41,9 @@ all: @MAKEALL@
.PHONY: all install install_xcin install_cin2tab install_tsintools \
install_tsintabsrc clean veryclean distclean
+cin2tab.o: cin2tab.c
+ $(CC) -c -o $*.o $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) $(INC_PATH) $<
+
.c.o:
$(CC) -c -o $*.o $(CFLAGS) $(DEFS) $(INC_PATH) $<
@@ -53,14 +56,18 @@ xcin: $(OBJS1) $(OBJS2)
#
tsintab: $(TSINTABS)
@ -22,7 +32,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2007/12/28 13:47:21 espie Exp $
tsin.rel: tsa2rel tsin.rel.src
./tsa2rel tsin.rel.src > tsin.rel
@@ -178,7 +182,7 @@ install_tsintabsrc:
@@ -178,7 +185,7 @@ install_tsintabsrc:
done
clean: