diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2007-06-18 21:35:50 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2007-06-18 21:35:50 +0000 |
| commit | 8049a87680d8898728c78a24937064a59ea1fcdb (patch) | |
| tree | e8e2dd1862e8f0ef6f4a332f342619f940959ed2 /biology | |
| parent | Add TCL binding for PostgreSQL client. This used to be part of PostgreSQL (diff) | |
- Fix the build with GCC 4.2
- Remove BROKEN tag
Reported by: pointyhat (logs)
Notes
Notes:
svn path=/head/; revision=193835
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/crimap/Makefile | 8 | ||||
| -rw-r--r-- | biology/crimap/files/patch-gcc4 | 31 |
2 files changed, 32 insertions, 7 deletions
diff --git a/biology/crimap/Makefile b/biology/crimap/Makefile index beccaef2cb94..a3428748d787 100644 --- a/biology/crimap/Makefile +++ b/biology/crimap/Makefile @@ -21,12 +21,6 @@ PROGRAMS= crimap EXAMPLES= chr7a.gen demo.dat EXIT_PATCH= e_ped.c get_log.c our_allo.c our_orde.c -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-patch: .for file in ${EXIT_PATCH} @${REINPLACE_CMD} -e 's|exit\ *()|exit(0)|' ${WRKSRC}/${file} @@ -50,4 +44,4 @@ do-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/biology/crimap/files/patch-gcc4 b/biology/crimap/files/patch-gcc4 new file mode 100644 index 000000000000..b15fe63303c0 --- /dev/null +++ b/biology/crimap/files/patch-gcc4 @@ -0,0 +1,31 @@ +--- our_allo.c.orig Tue Jun 19 04:31:56 2007 ++++ our_allo.c Tue Jun 19 04:30:44 2007 +@@ -21,10 +21,11 @@ + static HEADER base; + static HEADER *allocp = NULL; + ++static HEADER *morecore(); ++ + char *our_alloc(nbytes) + ALLOC nbytes; + { +- HEADER *morecore(); + HEADER *p; + HEADER *q; + ALLOC nunits; +diff -ur work/our_orde.c foo/our_orde.c +--- our_orde.c.orig Tue Jun 19 04:31:56 2007 ++++ our_orde.c Tue Jun 19 04:31:30 2007 +@@ -21,10 +21,11 @@ + static HEADER orders_base; + static HEADER *orders_allocp = NULL; + ++static HEADER *orders_morecore(); ++ + char *our_orders_alloc(nbytes) + ALLOC nbytes; + { +- HEADER *orders_morecore(); + HEADER *p, *q; + ALLOC nunits; + |