From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4093138334 for ; Sun, 13 Oct 2019 11:22:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D394BE084A; Sun, 13 Oct 2019 11:22:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0429E084A for ; Sun, 13 Oct 2019 11:22:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7AEFC34BCC6 for ; Sun, 13 Oct 2019 11:22:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B768884 for ; Sun, 13 Oct 2019 11:22:12 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1570965718.650bfa08aad0ce31430f6a848b6c6631eada41be.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/med/files/med-3.3.1-cmake-fortran.patch sci-libs/med/files/med-3.3.1-disable-python-compile.patch sci-libs/med/files/med-4.0.0-cmakelist.patch sci-libs/med/files/med-4.0.0-installdoc.patch sci-libs/med/med-4.0.0-r2.ebuild X-VCS-Directories: sci-libs/med/ sci-libs/med/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 650bfa08aad0ce31430f6a848b6c6631eada41be X-VCS-Branch: master Date: Sun, 13 Oct 2019 11:22:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 022a5aab-9f36-4f13-bc42-04bde14b3057 X-Archives-Hash: aec1dc6e0424c16025403ba8cb21fd12 commit: 650bfa08aad0ce31430f6a848b6c6631eada41be Author: Bernd Waibel gmail com> AuthorDate: Sun Sep 15 13:06:18 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Oct 13 11:21:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650bfa08 sci-libs/med: switch to cmake based build The patch moves back to the cmake based build used in sci-libs/libmed. The issues with sci-libs/gmsh not building with cmake built med have been resolved. See https://bugs.gentoo.org/693146 comments 19-22 Closes: https://bugs.gentoo.org/694468 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Bernd Waibel gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12930 Signed-off-by: Joonas Niilola gentoo.org> sci-libs/med/files/med-3.3.1-cmake-fortran.patch | 21 ++++ .../files/med-3.3.1-disable-python-compile.patch | 17 +++ sci-libs/med/files/med-4.0.0-cmakelist.patch | 59 +++++++++++ sci-libs/med/files/med-4.0.0-installdoc.patch | 15 +++ sci-libs/med/med-4.0.0-r2.ebuild | 117 +++++++++++++++++++++ 5 files changed, 229 insertions(+) diff --git a/sci-libs/med/files/med-3.3.1-cmake-fortran.patch b/sci-libs/med/files/med-3.3.1-cmake-fortran.patch new file mode 100644 index 00000000000..1f475d58484 --- /dev/null +++ b/sci-libs/med/files/med-3.3.1-cmake-fortran.patch @@ -0,0 +1,21 @@ +Make cmake properly disable fortran upon user requirments + +--- ./CMakeLists.txt.orig 2016-07-01 15:28:57.139304608 +0300 ++++ ./CMakeLists.txt 2016-07-01 15:34:22.295899455 +0300 +@@ -8,10 +8,13 @@ + + INCLUDE(CheckLanguage) + CHECK_LANGUAGE(Fortran) +-IF(CMAKE_Fortran_COMPILER) ++OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON) ++IF(MEDFILE_BUILD_FORTRAN) + ENABLE_LANGUAGE(Fortran) ++ IF(NOT CMAKE_Fortran_COMPILER) ++ MESSAGE(FATAL_EROOR "Fortran support was requested but not found") ++ ENDIF() + ELSE() +- MESSAGE(STATUS "No Fortran support") + ENDIF() + + ## Version number + diff --git a/sci-libs/med/files/med-3.3.1-disable-python-compile.patch b/sci-libs/med/files/med-3.3.1-disable-python-compile.patch new file mode 100644 index 00000000000..642b404ba88 --- /dev/null +++ b/sci-libs/med/files/med-3.3.1-disable-python-compile.patch @@ -0,0 +1,17 @@ +--- ./config/cmake_files/medMacros.cmake 2016-10-24 09:55:35.000000000 +0200 ++++ ./config/cmake_files/medMacros.cmake.new 2018-01-24 10:50:15.146953227 +0100 +@@ -412,9 +412,9 @@ + FOREACH(input ${PYFILE2COMPINST}) + GET_FILENAME_COMPONENT(inputname ${input} NAME) + INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}) +- INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")") +- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")") +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")") +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")") ++ #INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")") ++ #INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")") ++ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")") ++ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")") + ENDFOREACH(input ${PYFILE2COMPINST}) + ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC) + diff --git a/sci-libs/med/files/med-4.0.0-cmakelist.patch b/sci-libs/med/files/med-4.0.0-cmakelist.patch new file mode 100644 index 00000000000..4c023cf24b3 --- /dev/null +++ b/sci-libs/med/files/med-4.0.0-cmakelist.patch @@ -0,0 +1,59 @@ +--- a/src/CMakeLists.txt 2018-07-28 16:37:01.180598992 +0200 ++++ a/src/CMakeLists.txt.new 2018-07-28 17:14:49.147775461 +0200 +@@ -1,7 +1,3 @@ +-INCLUDE_DIRECTORIES( +- ${HDF5_INCLUDE_DIRS} +- ${MPI_INCLUDE_DIRS}) +- + # On Win platform, we need to make sure symbols are properly exported in + # the intermediary OBJECT targes built in the sub-directories: + # The definition "-D_EXPORTS" is normally added automatically by CMake +@@ -19,6 +15,12 @@ + INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include + ${PROJECT_SOURCE_DIR}/include) + ++# these includes must go after project ones to avoid masking by ++# previous versions already installed ++INCLUDE_DIRECTORIES( ++ ${HDF5_INCLUDE_DIRS} ++ ${MPI_INCLUDE_DIRS}) ++ + # Get pure C intermediary targets: + ADD_SUBDIRECTORY(hdfi) + ADD_SUBDIRECTORY(ci) +--- a/tools/mdump/CMakeLists.txt 2018-07-29 09:24:35.714930029 +0200 ++++ a/tools/mdump/CMakeLists.txt.new 2018-07-29 09:58:48.667089767 +0200 +@@ -33,6 +33,6 @@ + CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY) + + INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin) +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") + +--- a/src/2.3.6/CMakeLists.txt 2018-07-30 22:45:56.205079148 +0200 ++++ a/src/2.3.6/CMakeLists.txt.new 2018-07-30 22:49:43.520096835 +0200 +@@ -1,8 +1,3 @@ +-INCLUDE_DIRECTORIES( +- ${HDF5_INCLUDE_DIRS} +- ${MPI_INCLUDE_DIRS} +-) +- + SET(med236_SOURCES MEDaffiche.c) + + # Definitions +@@ -13,6 +8,13 @@ + "${PROJECT_BINARY_DIR}/include/2.3.6" + "${PROJECT_SOURCE_DIR}/include/2.3.6") + ++# these includes must go after project ones to avoid masking by ++# previous versions already installed ++INCLUDE_DIRECTORIES( ++ ${HDF5_INCLUDE_DIRS} ++ ${MPI_INCLUDE_DIRS} ++) ++ + # Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236 + # (and their static counterpart): + ADD_SUBDIRECTORY(cfi) diff --git a/sci-libs/med/files/med-4.0.0-installdoc.patch b/sci-libs/med/files/med-4.0.0-installdoc.patch new file mode 100644 index 00000000000..2d9361c4265 --- /dev/null +++ b/sci-libs/med/files/med-4.0.0-installdoc.patch @@ -0,0 +1,15 @@ +--- ./CMakeLists.txt 2019-02-26 11:59:15.276962751 +0100 ++++ ./CMakeLists.txt.new 2019-02-26 11:59:26.660962707 +0100 +@@ -137,9 +137,10 @@ + ENDIF() + + ## Installation of the doc ++set(MEDFILE_DOC_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} CACHE PATH "install dir for documentation") + IF(MEDFILE_INSTALL_DOC OR MEDFILE_BUILD_DOC) +- INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE) +- INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png") ++ INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${MEDFILE_DOC_DIRECTORY} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE) ++ INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${MEDFILE_DOC_DIRECTORY} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png") + ENDIF() + + ####################### diff --git a/sci-libs/med/med-4.0.0-r2.ebuild b/sci-libs/med/med-4.0.0-r2.ebuild new file mode 100644 index 00000000000..837437559bd --- /dev/null +++ b/sci-libs/med/med-4.0.0-r2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# EAPI=7 uses ninja generator by default but it's incompatible with USE=fortran +# https://github.com/Kitware/ninja/tree/features-for-fortran#readme +CMAKE_MAKEFILE_GENERATOR=emake + +FORTRAN_NEEDED=fortran + +# NOTE:The build for multiple python versions should be possible but +# complicated for the build system +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit cmake-utils fortran-2 python-single-r1 + +DESCRIPTION="A library to store and exchange meshed data or computation results" +HOMEPAGE="https://www.salome-platform.org/user-section/about/med" +SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fortran mpi python test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="python? ( test )" + +# dev-lang/tk is needed for wish-based xmdump utility +RDEPEND=" + !sci-libs/libmed + dev-lang/tk:0= + >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] + mpi? ( virtual/mpi[fortran=] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" + +PATCHES=( + "${FILESDIR}/${PN}-3.3.1-cmake-fortran.patch" + "${FILESDIR}/${PN}-3.3.1-disable-python-compile.patch" # managed by function of python eclass + "${FILESDIR}/${P}-cmakelist.patch" + "${FILESDIR}/${P}-installdoc.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + if use python; then + # fixes for correct libdir name + local pysite=$(python_get_sitedir) + pysite="${pysite##/usr/}" + sed \ + -e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \ + -i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed" + fi + for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt + do + sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \ + "${cm}" || die "sed on ${cm} failed" + done + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, + # so let's avoid rebuilding it because it will be different + -DMEDFILE_BUILD_DOC=OFF + -DMEDFILE_BUILD_FORTRAN=$(usex fortran) + -DMEDFILE_BUILD_PYTHON=$(usex python) + -DMEDFILE_BUILD_SHARED_LIBS=ON + -DMEDFILE_BUILD_STATIC_LIBS=OFF + -DMEDFILE_BUILD_TESTS=$(usex test) + -DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html # custom var created by patches + -DMEDFILE_INSTALL_DOC=$(usex doc) + -DMEDFILE_USE_MPI=$(usex mpi) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + # we don't need old 2.3.6 include files + rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" + + # the optimization done in CMakeLists.txt has been disabled so + # we need to do it manually + use python && python_optimize + + # Prevent test executables being installed + if use test; then + rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables" + if use fortran; then + rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables" + fi + if use python; then + rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables" + fi + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake-utils_src_test +}