diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-04-16 08:30:59 +0200 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-04-16 08:30:59 +0200 |
commit | 96ffd3804b0c8bc359701fa017f79476f500903e (patch) | |
tree | d8bcd11ae17f23e7e2d6deebb155400ecf1e21b6 /sci-libs | |
parent | In CVS (diff) | |
download | sci-96ffd3804b0c8bc359701fa017f79476f500903e.tar.gz sci-96ffd3804b0c8bc359701fa017f79476f500903e.tar.bz2 sci-96ffd3804b0c8bc359701fa017f79476f500903e.zip |
In CVS
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/cgnslib/ChangeLog | 71 | ||||
-rw-r--r-- | sci-libs/cgnslib/Manifest | 2 | ||||
-rw-r--r-- | sci-libs/cgnslib/cgnslib-2.5.4.ebuild | 57 | ||||
-rw-r--r-- | sci-libs/cgnslib/cgnslib-3.2.1.ebuild | 49 | ||||
-rw-r--r-- | sci-libs/cgnslib/files/cgnslib-2.5.4.patch | 71 | ||||
-rw-r--r-- | sci-libs/cgnslib/files/cgnslib-2.5.4_hdf5.patch | 39 | ||||
-rw-r--r-- | sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch | 149 | ||||
-rw-r--r-- | sci-libs/cgnslib/metadata.xml | 8 |
8 files changed, 0 insertions, 446 deletions
diff --git a/sci-libs/cgnslib/ChangeLog b/sci-libs/cgnslib/ChangeLog deleted file mode 100644 index 6925f152e..000000000 --- a/sci-libs/cgnslib/ChangeLog +++ /dev/null @@ -1,71 +0,0 @@ -# ChangeLog for sci-libs/cgnslib -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*cgnslib-3.2.1 (29 Dec 2013) - - 29 Dec 2013; Justin Lecher <jlec@gentoo.org> +cgnslib-3.2.1.ebuild, - +files/cgnslib-3.2.1-cmake.patch, metadata.xml: - Version Bump - - 22 May 2012; Justin Lecher <jlec@gentoo.org> cgnslib-2.5.4.ebuild, - metadata.xml: - Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits - - 24 Jun 2011; Justin Lecher <jlec@gentoo.org> cgnslib-2.5.4.ebuild: - Streamlined fortran-2 eclass usage - - 21 Jun 2011; Justin Lecher <jlec@gentoo.org> cgnslib-2.5.4.ebuild: - Added fortran-2.eclass support - - 10 Jan 2011; Oliver Borm (boroli) <oli.borm@web.de> -cgnslib-2.5.3.ebuild, - -files/cgnslib-2.5.3_hdf5.patch, -files/cgnslib-2.5.3.patch, - cgnslib-2.5.4.ebuild, files/cgnslib-2.5.4_hdf5.patch: - delete old version, made hdf5 really apply again - - 16 Dec 2010; Justin Lecher <jlec@gentoo.org> cgnslib-2.5.3.ebuild, - cgnslib-2.5.4.ebuild: - Removal of fortran.eclass, #348851 - - 11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> - files/cgnslib-2.5.3_hdf5.patch, files/cgnslib-2.5.4_hdf5.patch: - Made the hdf5 patches apply again. - - 11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> - cgnslib-2.5.3.ebuild: - Removed hdf5 functionality since the required libraries are not available - anymore. - - 26 Jun 2010; Justin Lecher <jlec@gentoo.org> files/cgnslib-2.5.3.patch, - cgnslib-2.5.4.ebuild, files/cgnslib-2.5.4.patch: - Respecting LDFLAGS - - 15 Oct 2009; Etienne Lorriaux <etienne.lorriaux@gmail.com> - cgnslib-2.5.3.ebuild, cgnslib-2.5.4.ebuild: - Fixed DEPEND and RDEPEND confusion - - 03 Sep 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog: - Reintroduced cgnslib-2.5.3, as it needs <sci-libs/hdf5-1.8 - - 03 Sep 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog: - Needs now >=sci-libs/hdf5-1.8 - - 03 Sep 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog: - Corrected checksums, as upstream changed tarball. - - 27 Aug 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog: - sci-libs/cgnslib: Version bump, restricted to <sci-libs/hdf5-1.8 - - 22 Jul 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog: - executable rights for adf2hdf/hdf2adf - - 21 Jul 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog: - Installs ADF.h even without hdf5 USE-flag - - 21 Jul 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog: - Added patches from debian, changed to EAPI=2 - - 26 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de> +cgnslib-2.5.3.ebuild, - +metadata.xml: - Ebuild for cgnslib from bug 176455 - diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest deleted file mode 100644 index bed2c2af5..000000000 --- a/sci-libs/cgnslib/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cgnslib_2.5-4.tar.gz 398419 SHA256 0485b32649f1e15de2e85a17f0cb2b5fe4d2522415eafe1f6c8cfa4820719964 SHA512 12b73c5435d5bd3e1bc593efbf9c3479dbe436db721d0e0a95f5ab000cd707c11707d331dd2594a71338bc818f10c6019f491ce80554fe63c424c96819e57de7 WHIRLPOOL 27136cc88fe576563a39f10d57395ab0883829e3e4ba4d8a55a5ec47899fdc57ef5fc63c1a412fccca404e45f4e5ebbf267b4864f59e95bdc252a45c88b3b7ae -DIST cgnslib_3.2.1.tar.gz 865223 SHA256 34306316f04dbf6484343a4bc611b3bf912ac7dbc3c13b581defdaebbf6c1fc3 SHA512 318fda24e7f5f20407c6026ad4b10a84a0ea02a04d3dab3e0e2277d21cbc1b43f04eb65c4b912a7964e1219cf83afdabb357d25b40e76add9bed8bd2564a674e WHIRLPOOL 5f49f3e19712da5b178f7e40deb024a3287835613d61a46e2b7cb24fa4c9253dd87499b0e34a024945ced686b3a0d5c62ffbde88070f4d204d19f0651f8545f1 diff --git a/sci-libs/cgnslib/cgnslib-2.5.4.ebuild b/sci-libs/cgnslib/cgnslib-2.5.4.ebuild deleted file mode 100644 index f31ca4d86..000000000 --- a/sci-libs/cgnslib/cgnslib-2.5.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils fortran-2 toolchain-funcs versionator - -MY_P="${PN}_$(replace_version_separator 2 '-')" -MY_S="${PN}_$(get_version_component_range 1-2)" - -DESCRIPTION="The CFD General Notation System (CGNS) is a standard for CFD data" -HOMEPAGE="http://www.cgns.org/" -SRC_URI="mirror://sourceforge/cgns/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="fortran hdf5 szip zlib" - -DEPEND=" - fortran? ( virtual/fortran ) - hdf5? ( >=sci-libs/hdf5-1.8 ) - szip? ( sci-libs/szip ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MY_S} - -pkg_setup() { - use fortran && fortran-2_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}.patch - use hdf5 && epatch "${FILESDIR}"/${P}_hdf5.patch -} - -src_configure() { - local myconf="--enable-gcc --enable-lfs --enable-shared=all --enable-64bit" - - tc-export CC FC - - econf \ - ${myconf} \ - $(use_with fortran) \ - $(use_with hdf5) \ - $(use_with zlib) \ - $(use_with szip) -} - -src_install() { - emake DESTDIR="${D}" install - use hdf5 && \ - fperms 755 /usr/bin/{hdf2adf,adf2hdf} || \ - rm -f "${D}"/usr/bin/{hdf2adf,adf2hdf} -} diff --git a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild b/sci-libs/cgnslib/cgnslib-3.2.1.ebuild deleted file mode 100644 index 509426624..000000000 --- a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -FORTRAN_NEEDED="fortran" - -inherit cmake-utils fortran-2 versionator - -MY_P="${PN}_$(replace_version_separator 3 '-')" -MY_S="${PN}_$(get_version_component_range 1-2)" - -DESCRIPTION="The CFD General Notation System (CGNS) is a standard for CFD data" -HOMEPAGE="http://www.cgns.org/" -SRC_URI="mirror://sourceforge/project/cgns/${MY_S}/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="fortran hdf5 legacy mpi szip zlib" - -DEPEND=" - hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) - szip? ( sci-libs/szip ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${PN}_${PV} - -PATCHES=( - "${FILESDIR}"/${P}-cmake.patch -) - -pkg_setup() { - use fortran && fortran-2_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DCGNS_ENABLE_64BIT=ON - $(usex x86 -DCGNS_ENABLE_LFS=ON) - $(cmake-utils_use fortran CGNS_ENABLE_FORTRAN) - $(cmake-utils_use hdf5 CGNS_ENABLE_HDF5) - $(cmake-utils_use legacy CGNS_ENABLE_LEGACY) - $(cmake-utils_use mpi HDF5_NEED_MPI) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/cgnslib/files/cgnslib-2.5.4.patch b/sci-libs/cgnslib/files/cgnslib-2.5.4.patch deleted file mode 100644 index a78f9a723..000000000 --- a/sci-libs/cgnslib/files/cgnslib-2.5.4.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- cgnslib_2.5.orig/Makefile.in 2008-01-19 04:45:16.000000000 +0100 -+++ cgnslib_2.5/Makefile.in 2008-10-16 00:31:07.000000000 +0200 -@@ -75,15 +75,18 @@ - -$(RM) config.log config.status Makefile - - install : $(CGNSLIB) -- $(INSTALL_DATA) cgnslib.h $(INCLUDEDIR)/cgnslib.h -- $(INSTALL_DATA) cgnslib_f.h $(INCLUDEDIR)/cgnslib_f.h -- $(INSTALL_DATA) cgnswin_f.h $(INCLUDEDIR)/cgnswin_f.h -- $(INSTALL_DATA) $(CGNSLIB) $(LIBDIR)/$(INSTLIB) -+ $(INSTALL_DATA) -D cgnslib.h $(DESTDIR)/$(INCLUDEDIR)/cgnslib.h -+ $(INSTALL_DATA) -D cgnslib_f.h $(DESTDIR)/$(INCLUDEDIR)/cgnslib_f.h -+ $(INSTALL_DATA) -D cgnswin_f.h $(DESTDIR)/$(INCLUDEDIR)/cgnswin_f.h -+ $(INSTALL_DATA) -D cgns_header.h $(DESTDIR)/$(INCLUDEDIR)/cgns_header.h -+ $(INSTALL_DATA) -D adf/ADF.h $(DESTDIR)/$(INCLUDEDIR)/adf/ADF.h -+ $(INSTALL_DATA) -D $(CGNSLIB) $(DESTDIR)/$(LIBDIR)/$(INSTLIB).2.0.0 -+ (cd $(DESTDIR)/$(LIBDIR)/; ln -s $(INSTLIB).2.0.0 $(INSTLIB); ln -s $(INSTLIB).2.0.0 $(INSTLIB).2) - - uninstall : -- -$(RM) $(INCLUDEDIR)/cgnslib.h -- -$(RM) $(INCLUDEDIR)/cgnslib_f.h -- -$(RM) $(INCLUDEDIR)/cgnswin_f.h -+ -$(RM) $(DESTDIR)/$(INCLUDEDIR)/cgnslib.h -+ -$(RM) $(DESTDIR)/$(INCLUDEDIR)/cgnslib_f.h -+ -$(RM) $(DESTDIR)/$(INCLUDEDIR)/cgnswin_f.h - -$(RM) $(LIBDIR)/$(INSTLIB) - - #---------- mid-level library ---- cgnslib_2.5.orig/configure.in 2008-01-19 04:45:16.000000000 +0100 -+++ cgnslib_2.5/configure.in 2008-10-15 22:58:22.000000000 +0200 -@@ -423,7 +423,7 @@ - shared=no - else - CFGFLAGS="-fPIC $CFGFLAGS" -- AR="\$(CC) -shared $SYSCFLAGS -Wl,-rpath,$cgnsdir/\$(SYSTEM)" -+ AR="\$(CC) -shared $SYSCFLAGS ${LDFLAGS} -Wl,-soname,libcgns.so.2" - LIBEXT=so - fi - fi ---- cgnslib_2.5.orig/configure 2008-01-19 04:45:16.000000000 +0100 -+++ cgnslib_2.5/configure 2008-10-15 23:11:41.000000000 +0200 -@@ -2048,7 +2048,7 @@ - shared=no - else - CFGFLAGS="-fPIC $CFGFLAGS" -- AR="\$(CC) -shared $SYSCFLAGS -Wl,-rpath,$cgnsdir/\$(SYSTEM)" -+ AR="\$(CC) -shared $SYSCFLAGS ${LDFLAGS} -Wl,-soname,libcgns.so.2" - LIBEXT=so - fi - fi ---- cgnslib_2.5.orig/make.defs.in 2006-10-03 01:06:41.000000000 +0200 -+++ cgnslib_2.5/make.defs.in 2008-10-15 23:49:36.000000000 +0200 -@@ -34,7 +34,7 @@ - O = @OBJEXT@ - A = @LIBEXT@ - EXE = @EXEEXT@ --LIBCGNS = @SYSTEM@/libcgns.@LIBEXT@ -+LIBCGNS = @SYSTEM@/libcgns.@LIBEXT@.2 - - #------------------------------------------------------------------------ - # CC - C compiler -@@ -75,7 +75,7 @@ - # strip command for executables - set to true if not used - #------------------------------------------------------------------------ - --STRIP = @STRIP@ -+STRIP = true - - #------------------------------------------------------------------------ - # library archiver and ranlib - diff --git a/sci-libs/cgnslib/files/cgnslib-2.5.4_hdf5.patch b/sci-libs/cgnslib/files/cgnslib-2.5.4_hdf5.patch deleted file mode 100644 index 2ff7c2ce8..000000000 --- a/sci-libs/cgnslib/files/cgnslib-2.5.4_hdf5.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -r -u cgnslib_2.5.orig/Makefile.in cgnslib_2.5/Makefile.in ---- cgnslib_2.5.orig/Makefile.in 2010-07-11 20:22:55.044206152 +0200 -+++ cgnslib_2.5/Makefile.in 2010-07-11 20:23:14.304264503 +0200 -@@ -79,7 +79,10 @@ - $(INSTALL_DATA) -D cgnslib_f.h $(DESTDIR)/$(INCLUDEDIR)/cgnslib_f.h - $(INSTALL_DATA) -D cgnswin_f.h $(DESTDIR)/$(INCLUDEDIR)/cgnswin_f.h - $(INSTALL_DATA) -D cgns_header.h $(DESTDIR)/$(INCLUDEDIR)/cgns_header.h -- $(INSTALL_DATA) -D adf/ADF.h $(DESTDIR)/$(INCLUDEDIR)/adf/ADF.h -+ $(INSTALL_DATA) -D adfh/ADF.h $(DESTDIR)/$(INCLUDEDIR)/adfh/ADF.h -+ $(INSTALL_DATA) -D adfh/ADFH.h $(DESTDIR)/$(INCLUDEDIR)/adfh/ADFH.h -+ $(INSTALL_DATA) -D $(OBJDIR)/adf2hdf$(EXE) $(DESTDIR)/usr/bin/adf2hdf$(EXE) -+ $(INSTALL_DATA) -D $(OBJDIR)/hdf2adf$(EXE) $(DESTDIR)/usr/bin/hdf2adf$(EXE) - $(INSTALL_DATA) -D $(CGNSLIB) $(DESTDIR)/$(LIBDIR)/$(INSTLIB).2.0.0 - (cd $(DESTDIR)/$(LIBDIR)/; ln -s $(INSTLIB).2.0.0 $(INSTLIB); ln -s $(INSTLIB).2.0.0 $(INSTLIB).2) - -diff -r -u cgnslib_2.5.orig/configure cgnslib_2.5/configure ---- cgnslib_2.5.orig/configure 2010-07-11 20:22:55.047417614 +0200 -+++ cgnslib_2.5/configure 2010-07-11 20:24:38.922295750 +0200 -@@ -2048,7 +2048,7 @@ - shared=no - else - CFGFLAGS="-fPIC $CFGFLAGS" -- AR="\$(CC) -shared $SYSCFLAGS ${LDFLAGS} -Wl,-soname,libcgns.so.2" -+ AR="\$(CC) -shared -lhdf5 $SYSCFLAGS ${LDFLAGS} -Wl,-soname,libcgns.so.2" - LIBEXT=so - fi - fi -diff -r -u cgnslib_2.5.orig/configure.in cgnslib_2.5/configure.in ---- cgnslib_2.5.orig/configure.in 2010-07-11 20:22:55.045204905 +0200 -+++ cgnslib_2.5/configure.in 2010-07-11 20:24:05.021200131 +0200 -@@ -423,7 +423,7 @@ - shared=no - else - CFGFLAGS="-fPIC $CFGFLAGS" -- AR="\$(CC) -shared $SYSCFLAGS ${LDFLAGS} -Wl,-soname,libcgns.so.2" -+ AR="\$(CC) -shared -lhdf5 $SYSCFLAGS ${LDFLAGS} -Wl,-soname,libcgns.so.2" - LIBEXT=so - fi - fi diff --git a/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch b/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch deleted file mode 100644 index bf8ea5f2b..000000000 --- a/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch +++ /dev/null @@ -1,149 +0,0 @@ - CMakeLists.txt | 20 +-------------- - src/CMakeLists.txt | 72 +++++++++++++++++++++++++++--------------------------- - 2 files changed, 37 insertions(+), 55 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d9c1b3c..d4c2bf7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -81,7 +81,7 @@ if (CGNS_ENABLE_LFS) - if (HAVE_OPEN64) - add_definitions(-DHAVE_LSEEK64) - endif (HAVE_OPEN64) -- if (HAVE_OPEN64) -+ if (HAVE_LSEEK64) - add_definitions(-DHAVE_LSEEK64) - endif (HAVE_LSEEK64) - endif (WIN32) -@@ -254,24 +254,6 @@ else (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI) - mark_as_advanced(FORCE CGNS_ENABLE_PARALLEL) - endif (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI) - --#################### --# RPATH Management # --#################### -- --# use, i.e. don't skip the full RPATH for the build tree --set(CMAKE_SKIP_BUILD_RPATH FALSE) -- --# when building, don't use the install RPATH already --# (but later on when installing) --set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -- --# the RPATH to be used when installing --set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -- --# add the automatically determined parts of the RPATH --# which point to directories outside the build tree to the install RPATH --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -- - ######## - # CGNS # - ######## -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3c12c6d..694da42 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -69,7 +69,7 @@ set(SYSCFLAGS "") - set(CFGFLAGS "") - set(LIBS "") - --file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib LIBDIR) -+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} LIBDIR) - file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/include INCLUDEDIR) - file(TO_NATIVE_PATH ${CMAKE_C_COMPILER} CC) - if (WIN32) -@@ -102,42 +102,42 @@ set(ZLIBLIB "") - set(MPIINC "") - set(MPILIBS "") - --macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE)
-- set(${RESULT_VARIABLE} "")
-- foreach(PATH ${${INPUT_PATH_VARIABLE}})
-- file(TO_NATIVE_PATH ${PATH} NATIVE_PATH)
-- list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH})
-- endforeach(PATH ${${INPUT_PATH_VARIABLE}})
--endmacro(native_paths)
-+macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE) -+ set(${RESULT_VARIABLE} "") -+ foreach(PATH ${${INPUT_PATH_VARIABLE}}) -+ file(TO_NATIVE_PATH ${PATH} NATIVE_PATH) -+ list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH}) -+ endforeach(PATH ${${INPUT_PATH_VARIABLE}}) -+endmacro(native_paths) - - if (CGNS_ENABLE_HDF5) - set(BUILDHDF5 1) -- if (HDF5_INCLUDE_PATH)
-- native_paths(HDF5_INCLUDE_PATH HDF5INC)
-- endif (HDF5_INCLUDE_PATH)
-- if (HDF5_LIBRARY)
-- native_paths(HDF5_LIBRARY HDF5LIB)
-- endif (HDF5_LIBRARY)
-- if (HDF5_NEED_SZIP)
-- set(H5NEEDSZIP 1)
-- if (SZIP_LIBRARY)
-- native_paths(SZIP_LIBRARY SZIPLIB)
-- endif (SZIP_LIBRARY)
-- endif (HDF5_NEED_SZIP)
-- if (HDF5_NEED_ZLIB)
-- set(H5NEEDZLIB 1)
-- if (ZLIB_LIBRARY)
-- native_paths(${ZLIB_LIBRARY} ZLIBLIB)
-- endif (ZLIB_LIBRARY)
-- endif (HDF5_NEED_ZLIB)
-- if (HDF5_NEED_MPI)
-- set(H5NEEDMPI 1)
-- if (MPI_INC)
-- native_paths(MPI_INC MPIINC)
-- endif (MPI_INC)
-- if (MPI_LIBS)
-- native_paths(MPI_LIBS MPILIBS)
-- endif (MPI_LIBS)
-+ if (HDF5_INCLUDE_PATH) -+ native_paths(HDF5_INCLUDE_PATH HDF5INC) -+ endif (HDF5_INCLUDE_PATH) -+ if (HDF5_LIBRARY) -+ native_paths(HDF5_LIBRARY HDF5LIB) -+ endif (HDF5_LIBRARY) -+ if (HDF5_NEED_SZIP) -+ set(H5NEEDSZIP 1) -+ if (SZIP_LIBRARY) -+ native_paths(SZIP_LIBRARY SZIPLIB) -+ endif (SZIP_LIBRARY) -+ endif (HDF5_NEED_SZIP) -+ if (HDF5_NEED_ZLIB) -+ set(H5NEEDZLIB 1) -+ if (ZLIB_LIBRARY) -+ native_paths(${ZLIB_LIBRARY} ZLIBLIB) -+ endif (ZLIB_LIBRARY) -+ endif (HDF5_NEED_ZLIB) -+ if (HDF5_NEED_MPI) -+ set(H5NEEDMPI 1) -+ if (MPI_INC) -+ native_paths(MPI_INC MPIINC) -+ endif (MPI_INC) -+ if (MPI_LIBS) -+ native_paths(MPI_LIBS MPILIBS) -+ endif (MPI_LIBS) - if (CGNS_ENABLE_PARALLEL) - set(BUILDPARALLEL 1) - endif (CGNS_ENABLE_PARALLEL) -@@ -251,7 +251,7 @@ if(CGNS_BUILD_SHARED) - endif(CGNS_BUILD_SHARED) - - # Set the install path of the static library --install(TARGETS cgns_static ARCHIVE DESTINATION lib) -+install(TARGETS cgns_static ARCHIVE DESTINATION lib${LIB_SUFFIX}) - # Set the install path of the shared library - if(CGNS_BUILD_SHARED) - # for windows, need to install both cgnsdll.dll and cgnsdll.lib -@@ -259,7 +259,7 @@ if(CGNS_BUILD_SHARED) - install(TARGETS cgns_shared ARCHIVE DESTINATION lib) - install(TARGETS cgns_shared RUNTIME DESTINATION lib) - else (WIN32 OR CYGWIN) -- install(TARGETS cgns_shared LIBRARY DESTINATION lib) -+ install(TARGETS cgns_shared LIBRARY DESTINATION lib${LIB_SUFFIX}) - endif (WIN32 OR CYGWIN) - endif(CGNS_BUILD_SHARED) - diff --git a/sci-libs/cgnslib/metadata.xml b/sci-libs/cgnslib/metadata.xml deleted file mode 100644 index 70658221b..000000000 --- a/sci-libs/cgnslib/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <use> - <flag name="legacy">Enable or disable building legacy code (3.0 compatible)</flag> - </use> -</pkgmetadata> |