diff options
Diffstat (limited to 'sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch')
| -rw-r--r-- | sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch | 203 |
1 files changed, 203 insertions, 0 deletions
diff --git a/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch new file mode 100644 index 000000000000..96978320163b --- /dev/null +++ b/sci-libs/ccp4-libs/files/6.1.3-unbundle-libs.patch @@ -0,0 +1,203 @@ +diff --git a/lib/DiffractionImage/DiffractionImageCBF.cpp b/lib/DiffractionImage/DiffractionImageCBF.cpp +index 69b32b0..602e35f 100755 +--- a/lib/DiffractionImage/DiffractionImageCBF.cpp ++++ b/lib/DiffractionImage/DiffractionImageCBF.cpp +@@ -6,10 +6,10 @@ + // images. + + #include "DiffractionImage.h" +-#include "cbf.h" +-#include "cbf_simple.h" +-#include "cbf_string.h" +-#include "cbf_byte_offset.h" ++#include <cbflib/cbf.h> ++#include <cbflib/cbf_simple.h> ++#include <cbflib/cbf_string.h> ++#include <cbflib/cbf_byte_offset.h> + + + using namespace std; +diff --git a/lib/DiffractionImage/MAR/Makefile.in b/lib/DiffractionImage/MAR/Makefile.in +index 4264696..00c4d8d 100755 +--- a/lib/DiffractionImage/MAR/Makefile.in ++++ b/lib/DiffractionImage/MAR/Makefile.in +@@ -174,7 +174,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = gnu + noinst_LTLIBRARIES = libmar.la +-AM_CPPFLAGS = -I../CBFlib/src -I../CBFlib/include ++AM_CPPFLAGS = + libmar_la_SOURCES = mar300_header.c \ + mar345_header.c \ + marcif.c \ +diff --git a/lib/DiffractionImage/MAR/marcif.c b/lib/DiffractionImage/MAR/marcif.c +index d3f4212..2c37108 100755 +--- a/lib/DiffractionImage/MAR/marcif.c ++++ b/lib/DiffractionImage/MAR/marcif.c +@@ -31,8 +31,7 @@ + #include "marcif_header.h" + #include "mar345_header.h" + +-#include <cbf.h> +-#include <img.h> ++#include <cbflib/cbf.h> + + #define printe(x) printf("%s: %s: %s\n",prg,f,x) + #undef cbf_failnez +diff --git a/lib/DiffractionImage/Makefile.in b/lib/DiffractionImage/Makefile.in +index 8197956..807cf25 100755 +--- a/lib/DiffractionImage/Makefile.in ++++ b/lib/DiffractionImage/Makefile.in +@@ -106,23 +106,19 @@ PROGRAMS = $(bin_PROGRAMS) + am_automask_OBJECTS = automask.$(OBJEXT) + automask_OBJECTS = $(am_automask_OBJECTS) + automask_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ +- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ +- ./jpg/libjpeg.la ++ ./MAR/libmar.la ./Rigaku/librigaku.la + am_diff2jpeg_OBJECTS = diff2jpeg.$(OBJEXT) + diff2jpeg_OBJECTS = $(am_diff2jpeg_OBJECTS) + diff2jpeg_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ +- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ +- ./jpg/libjpeg.la ++ ./MAR/libmar.la ./Rigaku/librigaku.la + am_diffdump_OBJECTS = diffdump.$(OBJEXT) + diffdump_OBJECTS = $(am_diffdump_OBJECTS) + diffdump_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ +- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ +- ./jpg/libjpeg.la ++ ./MAR/libmar.la ./Rigaku/librigaku.la + am_printpeaks_OBJECTS = printpeaks.$(OBJEXT) + printpeaks_OBJECTS = $(am_printpeaks_OBJECTS) + printpeaks_DEPENDENCIES = libDiffImage.la ./Bruker/libbruker.la \ +- ./CBFlib/src/libcbf.la ./MAR/libmar.la ./Rigaku/librigaku.la \ +- ./jpg/libjpeg.la ++ ./MAR/libmar.la ./Rigaku/librigaku.la + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -284,8 +280,8 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = gnu +-SUBDIRS = CBFlib Bruker MAR Rigaku jpg +-AM_CPPFLAGS = -I./MAR -I./CBFlib/src -I./CBFlib/include -I./jpg ++SUBDIRS = Bruker MAR Rigaku ++AM_CPPFLAGS = -I./MAR + lib_LTLIBRARIES = libDiffImage.la $(am__append_1) $(am__append_2) \ + $(am__append_3) + libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \ +@@ -311,50 +307,50 @@ libDiffImage_la_SOURCES = DiffractionImageJpeg.cpp \ + dps_peaksearch_cn.c + + libDiffImage_la_LDFLAGS = -static +-libDiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ ++libDiffractionImage_la_DEPENDENCIES = libDiffImage.la \ + ./Bruker/libbruker.la ./MAR/libmar.la \ +- ./Rigaku/librigaku.la ./jpg/libjpeg.la ++ ./Rigaku/librigaku.la + + libDiffractionImage_la_SOURCES = DiffractionImageTclInterface.cpp + libDiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ +- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ +- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ ++ -lcbf ./Bruker/libbruker.la \ ++ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \ + --no-whole-archive -rpath '$(libdir)' + +-lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ ++lib_DiffractionImage_la_DEPENDENCIES = libDiffImage.la \ + ./Bruker/libbruker.la ./MAR/libmar.la \ +- ./Rigaku/librigaku.la ./jpg/libjpeg.la ++ ./Rigaku/librigaku.la + + lib_DiffractionImage_la_SOURCES = DiffractionImagePythonInterface.cpp + lib_DiffractionImage_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ +- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ +- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ ++ -lcbf ./Bruker/libbruker.la \ ++ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \ + --no-whole-archive -rpath '$(libdir)' + +-libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la ./CBFlib/src/libcbf.la \ ++libDiffractionImaJ_la_DEPENDENCIES = libDiffImage.la \ + ./Bruker/libbruker.la ./MAR/libmar.la \ +- ./Rigaku/librigaku.la ./jpg/libjpeg.la ++ ./Rigaku/librigaku.la + + libDiffractionImaJ_la_SOURCES = DiffractionImageJavaInterface.cpp + libDiffractionImaJ_la_LDFLAGS = -shared --whole-archive libDiffImage.la \ +- ./CBFlib/src/libcbf.la ./Bruker/libbruker.la \ +- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la \ ++ -lcbf ./Bruker/libbruker.la \ ++ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg \ + --no-whole-archive -rpath '$(libdir)' + +-automask_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ +- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la ++automask_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ ++ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg + + automask_SOURCES = automask.cpp +-diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ +- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la ++diffdump_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ ++ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg + + diffdump_SOURCES = diffdump.cpp +-printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ +- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la ++printpeaks_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ ++ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg + + printpeaks_SOURCES = printpeaks.cpp +-diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la ./CBFlib/src/libcbf.la \ +- ./MAR/libmar.la ./Rigaku/librigaku.la ./jpg/libjpeg.la ++diff2jpeg_LDADD = libDiffImage.la ./Bruker/libbruker.la -lcbf \ ++ ./MAR/libmar.la ./Rigaku/librigaku.la -ljpeg + + diff2jpeg_SOURCES = diff2jpeg.cpp + all: all-recursive +diff --git a/lib/DiffractionImage/configure b/lib/DiffractionImage/configure +index 3fb5784..fdf9683 100755 +--- a/lib/DiffractionImage/configure ++++ b/lib/DiffractionImage/configure +@@ -21768,7 +21768,7 @@ _ACEOF + fi + + +-ac_config_files="$ac_config_files Makefile CBFlib/Makefile CBFlib/src/Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile jpg/Makefile" ++ac_config_files="$ac_config_files Makefile MAR/Makefile Rigaku/Makefile Bruker/Makefile " + + + cat >confcache <<\_ACEOF +@@ -22407,12 +22407,9 @@ do + case $ac_config_target in + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "CBFlib/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/Makefile" ;; +- "CBFlib/src/Makefile") CONFIG_FILES="$CONFIG_FILES CBFlib/src/Makefile" ;; + "MAR/Makefile") CONFIG_FILES="$CONFIG_FILES MAR/Makefile" ;; + "Rigaku/Makefile") CONFIG_FILES="$CONFIG_FILES Rigaku/Makefile" ;; + "Bruker/Makefile") CONFIG_FILES="$CONFIG_FILES Bruker/Makefile" ;; +- "jpg/Makefile") CONFIG_FILES="$CONFIG_FILES jpg/Makefile" ;; + + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +diff --git a/lib/DiffractionImage/configure.in b/lib/DiffractionImage/configure.in +index 7f54b4b..69b10e1 100755 +--- a/lib/DiffractionImage/configure.in ++++ b/lib/DiffractionImage/configure.in +@@ -65,11 +65,8 @@ AM_CONDITIONAL([WANT_JAVA], test z${HAVE_JAVA} != z) + AC_CHECK_LIB([m], [sqrt]) + + AC_CONFIG_FILES([Makefile +- CBFlib/Makefile +- CBFlib/src/Makefile + MAR/Makefile + Rigaku/Makefile +- Bruker/Makefile +- jpg/Makefile]) ++ Bruker/Makefile]) + + AC_OUTPUT |