diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /sci-chemistry/openbabel-perl/files | |
parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) |
gentoo resync : 22.10.2018
Diffstat (limited to 'sci-chemistry/openbabel-perl/files')
-rw-r--r-- | sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch | 108 | ||||
-rw-r--r-- | sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch | 41 |
2 files changed, 0 insertions, 149 deletions
diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch deleted file mode 100644 index 92e126a77d86..000000000000 --- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-bindings_only.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 449f4b4..1c9ad00 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -252,7 +252,8 @@ if(NOT MSVC) - } - " SCANDIR_NEEDS_CONST) - -- set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}") -+ set(OB_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${OB_PLUGIN_INSTALL_DIR}" -+ CACHE PATH "Set to system install for bindings only build") - add_definitions(-DOB_MODULE_PATH="\\"${OB_MODULE_PATH}\\"") - - # Add some visibility support when using GCC -@@ -380,7 +381,8 @@ if(UNIX AND BUILD_SHARED) - if(APPLE) - set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}) - else() -- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") -+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" -+ CACHE PATH "Set sane rpath") - set(CMAKE_SKIP_BUILD_RPATH FALSE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -@@ -477,6 +479,13 @@ endif() - # Should the language bindings be regenereted? - option(RUN_SWIG "Generate language bindings with SWIG" OFF) - -+# Build bindings only -+option(BINDINGS_ONLY "Build bindings only" OFF) -+ -+# Point to library if building bindings only -+set(BABEL_SYSTEM_LIBRARY ${BABEL_LIBRARY} -+ CACHE PATH "Point to openbabel library if building bindings only") -+ - # Should all bindings be built? - option(ALL_BINDINGS "Build all languages bindings" OFF) - -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 16e9000..8f92e91 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -92,16 +92,30 @@ if (DO_PYTHON_BINDINGS) - endif(RUN_SWIG) - - add_library(bindings_python MODULE ${openbabel_SOURCE_DIR}/scripts/python/openbabel-python.cpp) -- target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY}) -+ if(BINDINGS_ONLY) -+ target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_SYSTEM_LIBRARY}) -+ else() -+ target_link_libraries(bindings_python ${PYTHON_LIBRARIES} ${BABEL_LIBRARY}) -+ endif() -+ - if(NOT WIN32) - set_target_properties(bindings_python PROPERTIES - OUTPUT_NAME _openbabel - PREFIX "" - SUFFIX .so ) -- add_dependencies(bindings_python openbabel) -- install(TARGETS bindings_python LIBRARY DESTINATION ${LIB_INSTALL_DIR}) -- install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py DESTINATION ${LIB_INSTALL_DIR}) -- install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py DESTINATION ${LIB_INSTALL_DIR}) -+ if(NOT BINDINGS_ONLY) -+ add_dependencies(bindings_python openbabel) -+ endif() -+ -+ install(TARGETS bindings_python -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ COMPONENT bindings_python) -+ install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py -+ DESTINATION ${LIB_INSTALL_DIR} -+ COMPONENT bindings_python) -+ install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py -+ DESTINATION ${LIB_INSTALL_DIR} -+ COMPONENT bindings_python) - else(NOT WIN32) - set_target_properties(bindings_python PROPERTIES - OUTPUT_NAME _openbabel -@@ -231,13 +245,25 @@ if (DO_PERL_BINDINGS) - endif (RUN_SWIG) - - add_library(bindings_perl MODULE ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp) -- target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY} ${PERL_EXTRA_LINK_FLAGS}) -+ if(BINDINGS_ONLY) -+ target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_SYSTEM_LIBRARY} ${PERL_EXTRA_LINK_FLAGS}) -+ else() -+ target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY} ${PERL_EXTRA_LINK_FLAGS}) -+ endif() -+ - set_target_properties(bindings_perl PROPERTIES - PREFIX "" - OUTPUT_NAME OpenBabel) -- add_dependencies(bindings_perl openbabel) -- install(TARGETS bindings_perl LIBRARY DESTINATION ${LIB_INSTALL_DIR}) -- install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm DESTINATION ${LIB_INSTALL_DIR}) -+ if(NOT BINDINGS_ONLY) -+ add_dependencies(bindings_perl openbabel) -+ endif() -+ -+ install(TARGETS bindings_perl -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/auto/Chemistry/OpenBabel/ -+ COMPONENT bindings_perl) -+ install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm -+ DESTINATION ${LIB_INSTALL_DIR}/Chemistry/ -+ COMPONENT bindings_perl) - - endif (DO_PERL_BINDINGS) - diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch deleted file mode 100644 index b72a622a3afb..000000000000 --- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.2-trunk_cmake.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index e7298ce..16e9000 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -231,36 +239,6 @@ if (DO_PERL_BINDINGS) - install(TARGETS bindings_perl LIBRARY DESTINATION ${LIB_INSTALL_DIR}) - install(FILES ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm DESTINATION ${LIB_INSTALL_DIR}) - -- set(PERL_INSTALLDIRS_TEXT "") -- if (OBPERL_INSTALLDIRS) -- set(PERL_INSTALLDIRS_TEXT "INSTALLDIRS=${OBPERL_INSTALLDIRS}") -- endif (OBPERL_INSTALLDIRS) -- -- if (NOT MSVC) -- add_custom_target(pre_bindings_perl ALL -- # Create the scripts/perl directory; we cannot do this inside -- # bindings_perl as the WORKING_DIRECTORY needs to already exist! -- COMMAND ${CMAKE_COMMAND} -E make_directory ${openbabel_BINARY_DIR}/scripts/perl -- ) -- add_custom_target(bindings_perl ALL -- COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/Makefile.PL ${openbabel_BINARY_DIR}/scripts/perl -- COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ${openbabel_BINARY_DIR}/scripts/perl -- COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp ${openbabel_BINARY_DIR}/scripts/perl -- COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL ${PERL_PREFIX_TEXT} ${PERL_INSTALLDIRS_TEXT} -- COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc make -- DEPENDS openbabel ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp -- WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl -- ) -- add_dependencies(bindings_perl pre_bindings_perl openbabel) -- install(CODE "execute_process(COMMAND make install DESTDIR=\$ENV{DESTDIR} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl)") -- -- else (NOT MSVC) -- add_library(bindings_perl MODULE ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp) -- target_link_libraries(bindings_perl ${PERL_LIBRARY} ${BABEL_LIBRARY}) -- set_target_properties(bindings_perl PROPERTIES -- OUTPUT_NAME openbabel_perl ) -- endif(NOT MSVC) -- - endif (DO_PERL_BINDINGS) - - ################### |