| 1 |
xarthisius 10/09/06 12:24:45 |
| 2 |
|
| 3 |
Added: rnaview-20040713-implicit.patch |
| 4 |
rnaview-20040713-makefile.patch |
| 5 |
Log: |
| 6 |
Respect LDFLAGS wrt bug 336196. Thanks to Diego for the report. Fix install and implicit function declaration. Drop old. |
| 7 |
|
| 8 |
(Portage version: 2.2_rc73/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-biology/rnaview/files/rnaview-20040713-implicit.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/rnaview/files/rnaview-20040713-implicit.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/rnaview/files/rnaview-20040713-implicit.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: rnaview-20040713-implicit.patch |
| 17 |
=================================================================== |
| 18 |
Fix implicit function declaration |
| 19 |
|
| 20 |
--- src/xml2ps.c |
| 21 |
+++ src/xml2ps.c |
| 22 |
@@ -36,7 +36,7 @@ |
| 23 |
void read_sugar_syn(char *inpfile, long **sugar_syn); |
| 24 |
void get_sugar_syn(FILE *inp, char *value_ch); |
| 25 |
void get_chain_broken(long nres, double **a, double **b, long *chain_broken); |
| 26 |
- |
| 27 |
+extern void get_BDIR(char *BDIR, char *filename); |
| 28 |
|
| 29 |
|
| 30 |
FILE *psfile; |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 sci-biology/rnaview/files/rnaview-20040713-makefile.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/rnaview/files/rnaview-20040713-makefile.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/rnaview/files/rnaview-20040713-makefile.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: rnaview-20040713-makefile.patch |
| 40 |
=================================================================== |
| 41 |
Fix install paths, respect LDFLAGS, CFLAGS |
| 42 |
|
| 43 |
http://bugs.gentoo.org/show_bug.cgi?id=336196 |
| 44 |
|
| 45 |
--- rnaml2ps/Makefile |
| 46 |
+++ rnaml2ps/Makefile |
| 47 |
@@ -5,16 +5,21 @@ |
| 48 |
RNADRAW = rnaml2ps |
| 49 |
OBJS_RNADRAW = rnaml2ps.o nrutil.o |
| 50 |
|
| 51 |
+all: $(RNADRAW) |
| 52 |
+ |
| 53 |
$(RNADRAW): $(OBJS_RNADRAW) |
| 54 |
- $(CC) -o $(RNADRAW) $(OBJS_RNADRAW) -lm |
| 55 |
+ $(CC) $(LDFLAGS) -o $(RNADRAW) $(OBJS_RNADRAW) -lm |
| 56 |
|
| 57 |
nrutil.o : nrutil.c |
| 58 |
- cc -c nrutil.c |
| 59 |
+ $(CC) $(CFLAGS) -c nrutil.c |
| 60 |
|
| 61 |
rnaml2ps.o : rnaml2ps.c |
| 62 |
- cc -c rnaml2ps.c |
| 63 |
+ $(CC) $(CFLAGS) -c rnaml2ps.c |
| 64 |
|
| 65 |
|
| 66 |
-.PHONY : clean |
| 67 |
+.PHONY : clean all install |
| 68 |
clean: |
| 69 |
- rm *.o |
| 70 |
+ rm -f *.o |
| 71 |
+ |
| 72 |
+install: |
| 73 |
+ install -D -m 0755 $(RNADRAW) $(DESTDIR)/usr/bin/$(RNADRAW) |
| 74 |
--- Makefile |
| 75 |
+++ Makefile |
| 76 |
@@ -56,9 +56,14 @@ |
| 77 |
$(OBJ)/multiple.o \ |
| 78 |
$(OBJ)/statistics.o |
| 79 |
|
| 80 |
+.PHONY: clean all install |
| 81 |
+ |
| 82 |
+SUBDIRS = rnaml2ps |
| 83 |
+ |
| 84 |
all: $(RNAVIEW) |
| 85 |
+ for dir in ${SUBDIRS} ; do ( cd $$dir ; ${MAKE} all ) ; done |
| 86 |
|
| 87 |
-CFLAGS = $(LINCLUDES) |
| 88 |
+CFLAGS += $(LINCLUDES) |
| 89 |
|
| 90 |
$(RNAVIEW) : $(HFILES) $(OBJ_FILE) |
| 91 |
$(CC) $(CFLAGS) -o $@ $(OBJ_FILE) $(LDFLAGS) -lm $(MALLOCLIB) |
| 92 |
@@ -111,6 +116,15 @@ |
| 93 |
clean: |
| 94 |
@rm -f $(OBJ)/*.o |
| 95 |
@rm -f $(ALLTARGETS) |
| 96 |
+ for dir in ${SUBDIRS} ; do ( cd $$dir ; ${MAKE} clean ) ; done |
| 97 |
+ |
| 98 |
+install: |
| 99 |
+ install -D -m 0755 bin/rnaview $(DESTDIR)/usr/bin/rnaview |
| 100 |
+ mkdir -p $(DESTDIR)/usr/share/rnaview/BASEPARS |
| 101 |
+ install -m 0644 BASEPARS/* $(DESTDIR)/usr/share/rnaview/BASEPARS |
| 102 |
+ mkdir -p $(DESTDIR)/usr/share/rnaview/test |
| 103 |
+ install -m 0644 test/* $(DESTDIR)/usr/share/rnaview/test |
| 104 |
+ for dir in ${SUBDIRS} ; do ( cd $$dir ; ${MAKE} install ) ; done |
| 105 |
|
| 106 |
export: |
| 107 |
mkdir -p $(EXPORT_DIR) |
Archives