diff options
Diffstat (limited to 'sci-biology/poa/files')
-rw-r--r-- | sci-biology/poa/files/poa-2-fno-common.patch | 13 | ||||
-rw-r--r-- | sci-biology/poa/files/poa-2-respect-flags.patch (renamed from sci-biology/poa/files/2-respect-flags.patch) | 28 |
2 files changed, 33 insertions, 8 deletions
diff --git a/sci-biology/poa/files/poa-2-fno-common.patch b/sci-biology/poa/files/poa-2-fno-common.patch new file mode 100644 index 000000000000..ddd738a5524c --- /dev/null +++ b/sci-biology/poa/files/poa-2-fno-common.patch @@ -0,0 +1,13 @@ +--- a/black_flag.h ++++ b/black_flag.h +@@ -236,8 +236,8 @@ + int sourceline, + char sourcefile_revision[]); + +-char *Program_name; +-char *Program_version; ++extern char *Program_name; ++extern char *Program_version; + + void black_flag_init(char progname[],char progversion[]); + void black_flag_init_args(int narg,char *arg[],char progversion[]); diff --git a/sci-biology/poa/files/2-respect-flags.patch b/sci-biology/poa/files/poa-2-respect-flags.patch index bdd638cf64b7..fb01f0b5f934 100644 --- a/sci-biology/poa/files/2-respect-flags.patch +++ b/sci-biology/poa/files/poa-2-respect-flags.patch @@ -1,26 +1,38 @@ -diff --git a/Makefile b/Makefile -index a65bed0..713a7ab 100644 --- a/Makefile +++ b/Makefile -@@ -26,9 +26,10 @@ LIBOBJECTS= \ +@@ -1,6 +1,3 @@ +- +-AR=ar rc +- + TARGETS=poa liblpo.a poa_doc libbflag.a + + # align_score.c CAN BE USED TO ADD CUSTOMIZED SCORING FUNCTIONS +@@ -26,9 +23,8 @@ stringptr.o -CC = gcc -+CC ?= gcc #CFLAGS= -g -ansi-strict -W -Wall -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. -CFLAGS= -g -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. -+OPT_CFLAGS = -g -+CFLAGS= $(OPT_CFLAGS) -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. ++CPPFLAGS+= -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I. # -I$(HOME)/lib/include # -DREPORT_MAX_ALLOC -@@ -44,7 +45,7 @@ liblpo.a: $(LIBOBJECTS) +@@ -37,14 +33,14 @@ + + liblpo.a: $(LIBOBJECTS) + rm -f $@ +- $(AR) $@ $(LIBOBJECTS) +- ranlib $@ ++ $(AR) rc $@ $(LIBOBJECTS) ++ $(RANLIB) $@ + + # NB: LIBRARY MUST FOLLOW OBJECTS OR LINK FAILS WITH UNRESOLVED REFERENCES!! poa: $(OBJECTS) liblpo.a - $(CC) -o $@ $(OBJECTS) -lm liblpo.a -+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) -lm liblpo.a what: @echo poa: partial-order based sequence alignment program |