| 1 |
jlec 12/07/06 13:38:49 |
| 2 |
|
| 3 |
Added: mosflm-7.0.9-buffer-overflow.patch |
| 4 |
7.0.9-parallel.patch |
| 5 |
Removed: 7.0.8-parallel.patch |
| 6 |
Log: |
| 7 |
sci-chemistry/mosflm: Version Bump |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: mosflm-7.0.9-buffer-overflow.patch |
| 18 |
=================================================================== |
| 19 |
mosflm/pilatus_c.c | 2 +- |
| 20 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 21 |
|
| 22 |
diff --git a/mosflm/pilatus_c.c b/mosflm/pilatus_c.c |
| 23 |
index 4a85b26..9893e0c 100644 |
| 24 |
--- a/mosflm/pilatus_c.c |
| 25 |
+++ b/mosflm/pilatus_c.c |
| 26 |
@@ -34,7 +34,7 @@ delete them later */ |
| 27 |
int cbf_int[16] = {0}; |
| 28 |
long cbf_int4[16] = {0}; |
| 29 |
double cbf_double[16] = {0}; |
| 30 |
- char cbf_char[16][24] = {' '}; |
| 31 |
+ char cbf_char[16][32] = {' '}; |
| 32 |
/* temporary from cbfwrap.c - pilatus doesn't have these, so we'll |
| 33 |
delete them later */ |
| 34 |
int id, index, iindex; |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 sci-chemistry/mosflm/files/7.0.9-parallel.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/files/7.0.9-parallel.patch?rev=1.1&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/mosflm/files/7.0.9-parallel.patch?rev=1.1&content-type=text/plain |
| 42 |
|
| 43 |
Index: 7.0.9-parallel.patch |
| 44 |
=================================================================== |
| 45 |
Makefile | 21 ++++++++++----------- |
| 46 |
cbf/Makefile | 9 +++++++-- |
| 47 |
2 files changed, 17 insertions(+), 13 deletions(-) |
| 48 |
|
| 49 |
diff --git a/Makefile b/Makefile |
| 50 |
index 3d2f543..2219d8d 100644 |
| 51 |
--- a/Makefile |
| 52 |
+++ b/Makefile |
| 53 |
@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a |
| 54 |
CBFLIBS = cbf/lib/libcbf.a |
| 55 |
JPGLIBS = jpg/libjpeg.a |
| 56 |
|
| 57 |
-all: $(DPSLIBS) $(CBFLIBS) $(JPGLIBS) |
| 58 |
- cd mosflm ; make |
| 59 |
+all: $(DPSLIBS) |
| 60 |
+ $(MAKE) -C mosflm |
| 61 |
|
| 62 |
dpslibs: |
| 63 |
@-find . -name "*a" -delete |
| 64 |
@@ -32,22 +32,21 @@ dpslibs: |
| 65 |
|
| 66 |
cbflibs: |
| 67 |
@-find ./cbf -name "*.a" -delete |
| 68 |
- cd cbf ; make all ; if [ -f $(RANLIB) ]; \ |
| 69 |
- then $(RANLIB) lib/libcbf.a; fi |
| 70 |
+ $(MAKE) -C cbf all |
| 71 |
|
| 72 |
jpglibs: |
| 73 |
- cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a |
| 74 |
+ cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a |
| 75 |
|
| 76 |
${DPSLIBS}: |
| 77 |
- make dpslibs |
| 78 |
+ $(MAKE) dpslibs |
| 79 |
|
| 80 |
${CBFLIBS}: |
| 81 |
- make cbflibs |
| 82 |
+ $(MAKE) cbflibs |
| 83 |
|
| 84 |
${JPGLIBS}: |
| 85 |
- make jpglibs |
| 86 |
+ $(MAKE) jpglibs |
| 87 |
|
| 88 |
-libs: ${DPSLIBS} ${CBFLIBS} ${JPGLIBS} |
| 89 |
+libs: ${DPSLIBS} ${CBFLIBS} |
| 90 |
@echo "****************************************************************" |
| 91 |
@echo " Making libraries for system ${HOSTTYPE}" |
| 92 |
@echo "****************************************************************" |
| 93 |
@@ -56,11 +55,11 @@ ipmosflm: libs |
| 94 |
@echo "****************************************************************" |
| 95 |
@echo " Making IPMOSFLM for system ${HOSTTYPE}" |
| 96 |
@echo "****************************************************************" |
| 97 |
- cd mosflm ; make ipmosflm |
| 98 |
+ $(MAKE) -C mosflm ipmosflm |
| 99 |
|
| 100 |
force: |
| 101 |
@-rm -f bin/ipmosflm |
| 102 |
- make ipmosflm |
| 103 |
+ $(MAKE) ipmosflm |
| 104 |
|
| 105 |
install: |
| 106 |
@echo "the executable is in ${MOSHOME}/bin/ipmosflm" |
| 107 |
diff --git a/cbf/Makefile b/cbf/Makefile |
| 108 |
index e61497c..c3c94ac 100644 |
| 109 |
--- a/cbf/Makefile |
| 110 |
+++ b/cbf/Makefile |
| 111 |
@@ -362,6 +362,8 @@ HEADERS = $(INCLUDE)/cbf.h \ |
| 112 |
$(EXAMPLES)/img.h \ |
| 113 |
$(INCLUDE)/md5.h |
| 114 |
|
| 115 |
+OBJ = $(subst .c,.o,$(SOURCE)) |
| 116 |
+ |
| 117 |
# |
| 118 |
# Compile the library and examples |
| 119 |
# |
| 120 |
@@ -379,11 +381,14 @@ $(INSTALLDIR): |
| 121 |
$(LIB): |
| 122 |
mkdir $(LIB) |
| 123 |
|
| 124 |
+ |
| 125 |
+.c.o: $(SOURCE) $(HEADERS) |
| 126 |
+ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $< |
| 127 |
+ |
| 128 |
# |
| 129 |
# CBF library |
| 130 |
# |
| 131 |
-$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) |
| 132 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 133 |
+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP) |
| 134 |
$(AR) cr $@ *.o |
| 135 |
rm *.o |
| 136 |
if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi |
Archives