diff options
| author | Pawel Pekala <pawel@FreeBSD.org> | 2013-12-20 13:27:13 +0000 |
|---|---|---|
| committer | Pawel Pekala <pawel@FreeBSD.org> | 2013-12-20 13:27:13 +0000 |
| commit | 91571f28bbf0669a34236012bee885c2fa72b48a (patch) | |
| tree | d3cc4b35ebc9c713f6a93070c7fce7484e3bcf2d /biology | |
| parent | - Fix build with clang (diff) | |
- Respect CC/CFLAGS
PR: ports/184857
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Notes
Notes:
svn path=/head/; revision=337010
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/grappa/Makefile | 9 | ||||
| -rw-r--r-- | biology/grappa/files/patch-Makefile | 40 |
2 files changed, 43 insertions, 6 deletions
diff --git a/biology/grappa/Makefile b/biology/grappa/Makefile index 2d9fabf89c14..3f655088e0e4 100644 --- a/biology/grappa/Makefile +++ b/biology/grappa/Makefile @@ -10,14 +10,13 @@ DISTNAME= GRAPPA20 MAINTAINER= ports@FreeBSD.org COMMENT= Genome Rearrangements Analysis and Phylogeny Software -USES= gmake -MAKE_ARGS= CC="${CC}" +USES= gmake PLIST_FILES= bin/grappa bin/invdist bin/distmat do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/grappa ${STAGEDIR}${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/grappa ${STAGEDIR}${PREFIX}/bin/invdist - ${LN} -sf ${PREFIX}/bin/grappa ${STAGEDIR}${PREFIX}/bin/distmat + (cd ${WRKSRC} && ${INSTALL_PROGRAM} grappa ${STAGEDIR}${PREFIX}/bin) + ${LN} -sf grappa ${STAGEDIR}${PREFIX}/bin/invdist + ${LN} -sf grappa ${STAGEDIR}${PREFIX}/bin/distmat .include <bsd.port.mk> diff --git a/biology/grappa/files/patch-Makefile b/biology/grappa/files/patch-Makefile index 3930cca93ef4..ae02304b23c0 100644 --- a/biology/grappa/files/patch-Makefile +++ b/biology/grappa/files/patch-Makefile @@ -1,6 +1,42 @@ --- Makefile.orig 2004-09-22 09:09:18.000000000 -0500 +++ Makefile 2011-03-26 13:49:31.000000000 -0500 -@@ -156,8 +156,2 @@ +@@ -47,7 +47,7 @@ + endif + + # GNU C +-CC = gcc ++CC ?= gcc + + # Microsoft C + # CC = cl +@@ -62,13 +62,13 @@ + #CC = tmcc -DMPBPA + + # Default CFLAGS +-CFLAGS := -D${OS} $(CONCORDE_CFLAGS) $(GMP_CFLAGS) -DINIT ++CFLAGS += -D${OS} $(CONCORDE_CFLAGS) $(GMP_CFLAGS) -DINIT + + # TESTING option for CFLAGS + # CFLAGS := -DTESTING $(CFLAGS) + + ifeq ($(strip $(CC)), gcc) +-CFLAGS := -O3 -Wall -DGCC $(CFLAGS) ++CFLAGS := -Wall -DGCC $(CFLAGS) + endif + ifeq ($(strip $(CC)), pgcc) + CFLAGS := -fast $(CFLAGS) +@@ -115,7 +115,7 @@ + RELBASE = GRAPPA + RELNAME = $(RELBASE)-$(VERS_MAJ).$(VERS_MIN) + +-LIBS := -lm -lc -lpthread ++LIBS := -lm -pthread + # added this part to the end of above "-l mpi" + ifeq ($(OS), SunOS) + LIBS := -liberty -lsocket -lposix4 -lnsl ${LIBS} +@@ -154,12 +154,6 @@ + $(RM) -fr $(RELNAME) + $(LS) -l $(RELNAME).tar.gz -$(RELNAME)/%.c : %.c - -$(CP) $< $(RELNAME)/. @@ -9,3 +45,5 @@ - -$(CP) $< $(RELNAME)/. - clean: + -rm -f *.${OBJ_SUFFIX} *~ ${EXEC} ${EXEC}.${EXE_SUFFIX} ${SYM} \ + core gmon.out |