diff options
| author | Shaun Amott <shaun@FreeBSD.org> | 2006-11-22 21:24:55 +0000 |
|---|---|---|
| committer | Shaun Amott <shaun@FreeBSD.org> | 2006-11-22 21:24:55 +0000 |
| commit | caa5b4df2d8c530f04b0e9dd91cfb5a3f80ae57d (patch) | |
| tree | 1019bde820bfb5cc4612ed361fccdf795a364c64 /devel/libcii | |
| parent | 7377c22a3e0e05276e0b1a0fe5a61dc1e9c5c818 (diff) | |
| download | ports-caa5b4df2d8c530f04b0e9dd91cfb5a3f80ae57d.tar.gz ports-caa5b4df2d8c530f04b0e9dd91cfb5a3f80ae57d.zip | |
Fix build on !i386.
Notes
Notes:
svn path=/head/; revision=177839
Diffstat (limited to 'devel/libcii')
| -rw-r--r-- | devel/libcii/Makefile | 25 | ||||
| -rw-r--r-- | devel/libcii/pkg-plist | 6 |
2 files changed, 24 insertions, 7 deletions
diff --git a/devel/libcii/Makefile b/devel/libcii/Makefile index 167ceac0408a..7b7027ae69fa 100644 --- a/devel/libcii/Makefile +++ b/devel/libcii/Makefile @@ -17,7 +17,7 @@ COMMENT= Library from "C Interfaces and Implementations" by David Hanson NO_WRKSUBDIR= yes MAKEFILE= makefile -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DMAXALIGH=8 -Iinclude" \ +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DMAXALIGN=8 -Iinclude" \ AS="${CC} -c -x assembler-with-cpp -traditional" \ LD="${CC}" LDFLAGS="" EXTRAS="" BUILDDIR=${PKGNAME} PLIST_SUB= CIIMAJOR="${CIIMAJOR}" @@ -27,12 +27,24 @@ CIIMAJOR= 1 CIIDEST= ${PREFIX}/lib/cii SAMPLES= double calc ids mpcalc wf xref cref iref kref \ - idents words basename dirname sort spin sieve + idents words basename dirname +I386_SAMPLES= sort spin sieve .include <bsd.port.pre.mk> -.if ${ARCH} != "i386" && ${ARCH} != "alpha" -BROKEN= "Does not compile on !i386 and !alpha" +.if ${ARCH} != "i386" +MAKE_ARGS+= "THREADS=" +PLIST_SUB+= NOTI386="@comment " +.else +PLIST_SUB+= NOTI386="" +.endif + +post-patch: +.if ${ARCH} != "i386" +. for i in ${I386_SAMPLES} + @${REINPLACE_CMD} -e 's/^ *\$$B${i}\$$E *\\\{0,1\}//' \ + ${WRKSRC}/makefile +. endfor .endif pre-build: @@ -61,6 +73,11 @@ do-install: .for a in ${SAMPLES} ${INSTALL_PROGRAM} ${CIIBUILD}/${a} ${CIIDEST}/${CIIMAJOR}/examples .endfor +.if ${ARCH} == "i386" +. for a in ${I386_SAMPLES} + ${INSTALL_PROGRAM} ${CIIBUILD}/${a} ${CIIDEST}/${CIIMAJOR}/examples +. endfor +.endif ## .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/cii diff --git a/devel/libcii/pkg-plist b/devel/libcii/pkg-plist index f06df5abdce4..e0a1bff7d552 100644 --- a/devel/libcii/pkg-plist +++ b/devel/libcii/pkg-plist @@ -11,9 +11,9 @@ lib/cii/%%CIIMAJOR%%/examples/idents lib/cii/%%CIIMAJOR%%/examples/words lib/cii/%%CIIMAJOR%%/examples/basename lib/cii/%%CIIMAJOR%%/examples/dirname -lib/cii/%%CIIMAJOR%%/examples/sort -lib/cii/%%CIIMAJOR%%/examples/spin -lib/cii/%%CIIMAJOR%%/examples/sieve +%%NOTI386%%lib/cii/%%CIIMAJOR%%/examples/sort +%%NOTI386%%lib/cii/%%CIIMAJOR%%/examples/spin +%%NOTI386%%lib/cii/%%CIIMAJOR%%/examples/sieve lib/cii/%%CIIMAJOR%%/include/ap.h lib/cii/%%CIIMAJOR%%/include/arena.h lib/cii/%%CIIMAJOR%%/include/arith.h |