| 1 |
jlec 15/03/02 13:14:37 |
| 2 |
|
| 3 |
Added: njplot-2.3-buildsystem.patch |
| 4 |
njplot-2.3-format-security.patch |
| 5 |
Log: |
| 6 |
Fix dependencies, #425710; make buildsystem sane; fix format-security |
| 7 |
|
| 8 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-biology/njplot/files/njplot-2.3-buildsystem.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/njplot/files/njplot-2.3-buildsystem.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/njplot/files/njplot-2.3-buildsystem.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: njplot-2.3-buildsystem.patch |
| 17 |
=================================================================== |
| 18 |
makefile | 16 ++++++++-------- |
| 19 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/makefile b/makefile |
| 22 |
index ccb7dc2..9488c2a 100644 |
| 23 |
--- a/makefile |
| 24 |
+++ b/makefile |
| 25 |
@@ -7,10 +7,10 @@ NO_PDF = -DNO_PDF |
| 26 |
#PDFLIB = -L$(PDF) -lpdf |
| 27 |
|
| 28 |
# c compiler and linker |
| 29 |
-CC = gcc |
| 30 |
+CC ?= gcc |
| 31 |
|
| 32 |
# Vibrant top directory |
| 33 |
-VIBRANT = /banques0/ncbiJun04 |
| 34 |
+VIBRANT = /usr/include/ncbi |
| 35 |
|
| 36 |
|
| 37 |
# X11 include directory |
| 38 |
@@ -24,15 +24,15 @@ OBJECTS = njplot-vib.o |
| 39 |
OBJUNROOTED = unrooted-vib.o preptree.o |
| 40 |
|
| 41 |
|
| 42 |
-CFLAGS = -c -DWIN_MOTIF -Dunix -I$(VIBRANT)/include -I$(VIBRANT)/vibrant -I$(VIBRANT)/corelib \ |
| 43 |
+CFLAGS += -c -DWIN_MOTIF -Dunix -I$(VIBRANT)/include -I$(VIBRANT)/vibrant -I$(VIBRANT)/corelib \ |
| 44 |
-I$(VIBRANT) -I$(PDF) -I$(X11INCL) -I$(MOTIFINCL) $(HELPFILENAME) $(NO_PDF) \ |
| 45 |
- -Wimplicit-function-declaration -g |
| 46 |
+ -Wimplicit-function-declaration |
| 47 |
|
| 48 |
all: njplot unrooted newicktops newicktotxt |
| 49 |
|
| 50 |
|
| 51 |
njplot : $(OBJECTS) |
| 52 |
- $(CC) -g -o njplot $(OBJECTS) \ |
| 53 |
+ $(CC) $(LDFLAGS) -o njplot $(OBJECTS) \ |
| 54 |
-L$(VIBRANT)/lib \ |
| 55 |
-lvibrant -lncbi \ |
| 56 |
$(PDFLIB) \ |
| 57 |
@@ -40,16 +40,16 @@ njplot : $(OBJECTS) |
| 58 |
-L/usr/X11R6/lib -lXmu -lXt -lX11 -lm |
| 59 |
|
| 60 |
unrooted : $(OBJUNROOTED) |
| 61 |
- $(CC) -g -o unrooted $(OBJUNROOTED) \ |
| 62 |
+ $(CC) $(LDFLAGS) -o unrooted $(OBJUNROOTED) \ |
| 63 |
-L$(VIBRANT)/lib -lvibrant -lncbi \ |
| 64 |
-L$(MOTIFLIB) -lXm \ |
| 65 |
-L/usr/X11R6/lib -lXmu -lXt -lX11 -lm |
| 66 |
|
| 67 |
newicktops: njplot-vib.c |
| 68 |
- $(CC) -DNO_GUI -DNO_PDF -o $@ njplot-vib.c -lm |
| 69 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -DNO_GUI -DNO_PDF -o $@ njplot-vib.c -lm |
| 70 |
|
| 71 |
newicktotxt: njplot-vib.c |
| 72 |
- $(CC) -DTTY -o $@ njplot-vib.c -lm |
| 73 |
+ $(CC) -DTTY $(LDFLAGS) $(CFLAGS) -o $@ njplot-vib.c -lm |
| 74 |
|
| 75 |
|
| 76 |
.c.o : |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.1 sci-biology/njplot/files/njplot-2.3-format-security.patch |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/njplot/files/njplot-2.3-format-security.patch?rev=1.1&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/njplot/files/njplot-2.3-format-security.patch?rev=1.1&content-type=text/plain |
| 84 |
|
| 85 |
Index: njplot-2.3-format-security.patch |
| 86 |
=================================================================== |
| 87 |
njplot-vib.c | 2 +- |
| 88 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 89 |
|
| 90 |
diff --git a/njplot-vib.c b/njplot-vib.c |
| 91 |
index fe55609..63fd3b6 100644 |
| 92 |
--- a/njplot-vib.c |
| 93 |
+++ b/njplot-vib.c |
| 94 |
@@ -1976,7 +1976,7 @@ PDFONLY" no window interface, just write the PDF/PostScript tree plot\n" |
| 95 |
#else |
| 96 |
fprintf(stderr, |
| 97 |
#endif |
| 98 |
- message); |
| 99 |
+ "%s", message); |
| 100 |
exit(0); |
| 101 |
} |
| 102 |
} |
Archives