diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-10-26 08:29:56 +0100 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-10-26 08:32:25 +0100 |
commit | 7d62034735e700ca67e977470d79f5571b15b221 (patch) | |
tree | 78d45bafd1284caf0c06b4b98131677301303cbb /sci-chemistry/mosflm/files/7.0.9-parallel.patch | |
parent | add co-maintainer Coacher to metadata (diff) | |
download | gentoo-7d62034735e700ca67e977470d79f5571b15b221.tar.gz gentoo-7d62034735e700ca67e977470d79f5571b15b221.tar.bz2 gentoo-7d62034735e700ca67e977470d79f5571b15b221.zip |
Drop "CCP4: Software for Macromolecular Crystallography"
obsoletes:
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=160190
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=324059
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=332485
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=367771
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=367773
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=383227
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=448756
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=460502
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=460504
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=466936
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=467040
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=467048
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=476580
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478580
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478586
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478588
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478594
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478604
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=521646
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=528512
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=530878
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=540760
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=555614
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=556498
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=557038
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=561196
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=562780
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'sci-chemistry/mosflm/files/7.0.9-parallel.patch')
-rw-r--r-- | sci-chemistry/mosflm/files/7.0.9-parallel.patch | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/sci-chemistry/mosflm/files/7.0.9-parallel.patch b/sci-chemistry/mosflm/files/7.0.9-parallel.patch deleted file mode 100644 index 38c6fc45a5c0..000000000000 --- a/sci-chemistry/mosflm/files/7.0.9-parallel.patch +++ /dev/null @@ -1,92 +0,0 @@ - Makefile | 21 ++++++++++----------- - cbf/Makefile | 9 +++++++-- - 2 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 3d2f543..2219d8d 100644 ---- a/Makefile -+++ b/Makefile -@@ -22,8 +22,8 @@ DPSLIBS = lib/DPSLIB.a - CBFLIBS = cbf/lib/libcbf.a - JPGLIBS = jpg/libjpeg.a - --all: $(DPSLIBS) $(CBFLIBS) $(JPGLIBS) -- cd mosflm ; make -+all: $(DPSLIBS) -+ $(MAKE) -C mosflm - - dpslibs: - @-find . -name "*a" -delete -@@ -32,22 +32,21 @@ dpslibs: - - cbflibs: - @-find ./cbf -name "*.a" -delete -- cd cbf ; make all ; if [ -f $(RANLIB) ]; \ -- then $(RANLIB) lib/libcbf.a; fi -+ $(MAKE) -C cbf all - - jpglibs: -- cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; make libjpeg.a -+ cd jpg ; if [ ! -f Makefile ]; then ./configure ; fi; $(MAKE) libjpeg.a - - ${DPSLIBS}: -- make dpslibs -+ $(MAKE) dpslibs - - ${CBFLIBS}: -- make cbflibs -+ $(MAKE) cbflibs - - ${JPGLIBS}: -- make jpglibs -+ $(MAKE) jpglibs - --libs: ${DPSLIBS} ${CBFLIBS} ${JPGLIBS} -+libs: ${DPSLIBS} ${CBFLIBS} - @echo "****************************************************************" - @echo " Making libraries for system ${HOSTTYPE}" - @echo "****************************************************************" -@@ -56,11 +55,11 @@ ipmosflm: libs - @echo "****************************************************************" - @echo " Making IPMOSFLM for system ${HOSTTYPE}" - @echo "****************************************************************" -- cd mosflm ; make ipmosflm -+ $(MAKE) -C mosflm ipmosflm - - force: - @-rm -f bin/ipmosflm -- make ipmosflm -+ $(MAKE) ipmosflm - - install: - @echo "the executable is in ${MOSHOME}/bin/ipmosflm" -diff --git a/cbf/Makefile b/cbf/Makefile -index e61497c..c3c94ac 100644 ---- a/cbf/Makefile -+++ b/cbf/Makefile -@@ -362,6 +362,8 @@ HEADERS = $(INCLUDE)/cbf.h \ - $(EXAMPLES)/img.h \ - $(INCLUDE)/md5.h - -+OBJ = $(subst .c,.o,$(SOURCE)) -+ - # - # Compile the library and examples - # -@@ -379,11 +381,14 @@ $(INSTALLDIR): - $(LIB): - mkdir $(LIB) - -+ -+.c.o: $(SOURCE) $(HEADERS) -+ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $< -+ - # - # CBF library - # --$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) -- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) -+$(LIB)/libcbf.a: $(OBJ) $(COMMONDEP) - $(AR) cr $@ *.o - rm *.o - if [ -f $(RANLIB) ]; then $(RANLIB) $@ ; fi |