diff options
Diffstat (limited to 'sci-biology/clustalw/files')
-rw-r--r-- | sci-biology/clustalw/files/1.83-as-needed.patch | 31 | ||||
-rw-r--r-- | sci-biology/clustalw/files/1.83-clang.patch | 11 |
2 files changed, 36 insertions, 6 deletions
diff --git a/sci-biology/clustalw/files/1.83-as-needed.patch b/sci-biology/clustalw/files/1.83-as-needed.patch index 9bb35b43f24a..54b78b0811e0 100644 --- a/sci-biology/clustalw/files/1.83-as-needed.patch +++ b/sci-biology/clustalw/files/1.83-as-needed.patch @@ -1,17 +1,36 @@ --- a/makefile +++ b/makefile -@@ -11,11 +11,11 @@ +@@ -10,25 +10,22 @@ + HEADERS = general.h clustalw.h - CC = cc +-CC = cc -CFLAGS = -c -O -LFLAGS = -O -lm -+CFLAGS += -c -+LIBS = -lm ++# C99 for gets() ++CFLAGS += -std=gnu99 ++LIBS += -lm clustalw : $(OBJECTS) amenu.o clustalw.o - $(CC) -o $@ $(OBJECTS) amenu.o clustalw.o $(LFLAGS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) amenu.o clustalw.o $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJECTS) amenu.o clustalw.o $(LIBS) interface.o : interface.c $(HEADERS) param.h - $(CC) $(CFLAGS) $*.c +- $(CC) $(CFLAGS) $*.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + amenu.o : amenu.c $(HEADERS) param.h +- $(CC) $(CFLAGS) $*.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + readmat.o : readmat.c $(HEADERS) matrices.h +- $(CC) $(CFLAGS) $*.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + trees.o : trees.c $(HEADERS) dayhoff.h +- $(CC) $(CFLAGS) $*.c +- +-.c.o : +- $(CC) $(CFLAGS) $? ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + diff --git a/sci-biology/clustalw/files/1.83-clang.patch b/sci-biology/clustalw/files/1.83-clang.patch new file mode 100644 index 000000000000..ea1202079d9e --- /dev/null +++ b/sci-biology/clustalw/files/1.83-clang.patch @@ -0,0 +1,11 @@ +--- a/interface.c ++++ b/interface.c +@@ -210,7 +210,7 @@ + Boolean name1 = FALSE; + sint ajb; + +- if(args[0]==NULL) return; ++ if(args[0]==NULL) return 0; + + + |