* [gentoo-commits] proj/sci:master commit in: sci-libs/cgnslib/files/, sci-libs/cgnslib/
@ 2013-12-29 13:02 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-29 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 4c8ef1bc7fda02d8b1981765943a30b8e27f4d6e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 12:52:28 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 12:52:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c8ef1bc
sci-libs/cgnslib: Version Bump
Package-Manager: portage-2.2.7
---
sci-libs/cgnslib/ChangeLog | 8 +-
sci-libs/cgnslib/cgnslib-3.2.1.ebuild | 49 ++++++++
sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch | 149 +++++++++++++++++++++++
sci-libs/cgnslib/metadata.xml | 5 +-
4 files changed, 209 insertions(+), 2 deletions(-)
diff --git a/sci-libs/cgnslib/ChangeLog b/sci-libs/cgnslib/ChangeLog
index ec92de8..6925f15 100644
--- a/sci-libs/cgnslib/ChangeLog
+++ b/sci-libs/cgnslib/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-libs/cgnslib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# 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
diff --git a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild b/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
new file mode 100644
index 0000000..1738762
--- /dev/null
+++ b/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 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-3.2.1-cmake.patch b/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
new file mode 100644
index 0000000..bf8ea5f
--- /dev/null
+++ b/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
@@ -0,0 +1,149 @@
+ 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
index d369d06..7065822 100644
--- a/sci-libs/cgnslib/metadata.xml
+++ b/sci-libs/cgnslib/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <herd>sci</herd>
+ <use>
+ <flag name="legacy">Enable or disable building legacy code (3.0 compatible)</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/cgnslib/files/, sci-libs/cgnslib/
@ 2015-04-16 6:34 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-04-16 6:34 UTC (permalink / raw
To: gentoo-commits
commit: 96ffd3804b0c8bc359701fa017f79476f500903e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 06:30:59 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 06:30:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=96ffd380
In CVS
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/cgnslib/ChangeLog | 71 -----------
sci-libs/cgnslib/cgnslib-2.5.4.ebuild | 57 ---------
sci-libs/cgnslib/cgnslib-3.2.1.ebuild | 49 --------
sci-libs/cgnslib/files/cgnslib-2.5.4.patch | 71 -----------
sci-libs/cgnslib/files/cgnslib-2.5.4_hdf5.patch | 39 ------
sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch | 149 -----------------------
sci-libs/cgnslib/metadata.xml | 8 --
7 files changed, 444 deletions(-)
diff --git a/sci-libs/cgnslib/ChangeLog b/sci-libs/cgnslib/ChangeLog
deleted file mode 100644
index 6925f15..0000000
--- 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/cgnslib-2.5.4.ebuild b/sci-libs/cgnslib/cgnslib-2.5.4.ebuild
deleted file mode 100644
index f31ca4d..0000000
--- 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 5094266..0000000
--- 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 a78f9a7..0000000
--- 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 2ff7c2c..0000000
--- 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 bf8ea5f..0000000
--- 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 7065822..0000000
--- 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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-16 6:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-16 6:34 [gentoo-commits] proj/sci:master commit in: sci-libs/cgnslib/files/, sci-libs/cgnslib/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-12-29 13:02 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox