diff options
Diffstat (limited to 'sci-libs/cctbx/files/2010.03.29.2334-clipper.patch')
-rw-r--r-- | sci-libs/cctbx/files/2010.03.29.2334-clipper.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-clipper.patch b/sci-libs/cctbx/files/2010.03.29.2334-clipper.patch new file mode 100644 index 000000000000..8830dd8a054e --- /dev/null +++ b/sci-libs/cctbx/files/2010.03.29.2334-clipper.patch @@ -0,0 +1,77 @@ +diff --git a/cctbx_sources/clipper_adaptbx/SConscript b/cctbx_sources/clipper_adaptbx/SConscript +index 9cce49e..1046ed0 100644 +--- a/cctbx_sources/clipper_adaptbx/SConscript ++++ b/cctbx_sources/clipper_adaptbx/SConscript +@@ -1,56 +1,13 @@ + import libtbx.load_env + Import("env_base", "env_etc") + +-env_etc.clipper_dist = libtbx.env.dist_path("clipper") +-env_etc.clipper_include = env_etc.clipper_dist +- + env = env_base.Clone( + SHLINKFLAGS=env_etc.shlinkflags, + LIBS=env_etc.libm) +-env.Prepend(CPPPATH=[env_etc.clipper_include]) +- +-if (env_etc.static_libraries): builder = env.StaticLibrary +-else: builder = env.SharedLibrary +-builder(target='#lib/clipper', +- source = ["../clipper/clipper/core/"+file_name for file_name in """ +- atomsf.cpp +- cell.cpp +- clipper_memory.cpp +- clipper_message.cpp +- clipper_stats.cpp +- clipper_types.cpp +- clipper_util.cpp +- container.cpp +- container_hkl.cpp +- container_map.cpp +- container_types.cpp +- coords.cpp +- derivs.cpp +- hkl_compute.cpp +- hkl_data.cpp +- hkl_datatypes.cpp +- hkl_info.cpp +- hkl_lookup.cpp +- hkl_operators.cpp +- map_interp.cpp +- map_utils.cpp +- nxmap.cpp +- nxmap_operator.cpp +- ramachandran.cpp +- resol_basisfn.cpp +- resol_fn.cpp +- resol_targetfn.cpp +- rotation.cpp +- spacegroup.cpp +- spacegroup_data.cpp +- symop.cpp +- xmap.cpp +-""".split()]) +-# fftmap_sparse.cpp +-# fftmap.cpp + + env_exe = env.Clone() +-env_exe.Prepend(LIBS=["clipper"]) ++env_exe.Prepend(LIBS=["clipper-minimol","clipper-mmdb","clipper-cns","clipper-cif","clipper-contrib","clipper-ccp4","clipper-phs","clipper-core"]) ++env_exe.Prepend(SHLINKFLAGS=["-Wl,--as-needed"]) + + exe = env_exe.Program( + target='#exe_dev/'+env["PROGPREFIX"]+'clipper.symtest' +@@ -76,12 +33,10 @@ if (hasattr(env_etc, "cctbx_include")): + env_etc.include_registry.append( + env=env_clipper_boost_python_ext, + paths=[ +- env_etc.clipper_include, + env_etc.libtbx_include, + env_etc.cctbx_include, + env_etc.scitbx_include, + env_etc.boost_adaptbx_include, +- env_etc.boost_include, + env_etc.python_include]) + Export("env_clipper_boost_python_ext") +- SConscript("clipper/SConscript") ++ |