* [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/
@ 2016-03-18 19:18 Sebastien Fabbro
0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro @ 2016-03-18 19:18 UTC (permalink / raw
To: gentoo-commits
commit: c9a62f92fd53c520cff4ca6607e707a11e2e761e
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 22:42:55 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 20:10:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a62f92
sci-libs/hdf: Version bump
Package-Manager: portage-2.2.27
sci-libs/hdf/Manifest | 1 +
.../files/hdf-4.2.11-enable-fortran-shared.patch | 35 ++++++
.../hdf/files/hdf-4.2.11-fix-examples-dir.patch | 120 +++++++++++++++++++++
.../hdf/files/hdf-4.2.11-fix-szip-detection.patch | 27 +++++
sci-libs/hdf/hdf-4.2.11.ebuild | 66 ++++++++++++
5 files changed, 249 insertions(+)
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f1ec6cf..34e6461 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,2 +1,3 @@
+DIST hdf-4.2.11.tar.bz2 3173535 SHA256 bb0e900b8cc6bc89a5730abc97e654e7705e8e1fbc4e0d4477f417822428d99b SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781 WHIRLPOOL 6168284c0f4cb272cfa14f12779ca2106d86d68d38d85f58ba73c137611acde6ed3d1c32bd5620496b20578de7decae6428654eb6a3afffbf7c11fff1ccebc20
DIST hdf-4.2.8.tar.bz2 3027253 SHA256 e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e WHIRLPOOL 89ac6a092024fe2fac61bff918c14bf90e80db0b77f48e2ffe7cbf05610a3687e214c684f49e909b985c09b6baacf3dc730a15141fb44a3d59c191777c538299
DIST hdf-4.2.9.tar.bz2 3126686 SHA256 942a54bff4da8c0733c5626b5e11162deda1adeb65c384b141f0681c935ca98a SHA512 99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390 WHIRLPOOL 0ed161fba7f862c1d93aebbcb6184c0b256ce71be12fa49598f9c8bf727ea1ef46c612c41908a49774b7982f5dfe577bcb8ada2c26bf2488627952040bdd9934
diff --git a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
new file mode 100644
index 0000000..7d48a8a
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
@@ -0,0 +1,35 @@
+--- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000
++++ hdf-4.2.11/configure.ac 2016-03-16 20:15:56.767311873 +0000
+@@ -224,20 +224,6 @@
+ ## Build static libraries by default. Furthermore, fortran shared libraries
+ ## are unsupported. Disallow a user from enabling both shared libraries and
+ ## fortran.
+-if test "X${enable_shared}" != "Xyes"; then
+- enable_shared="no"
+-fi
+-
+-if test "X${enable_shared}" = "Xyes"; then
+- if test "X${BUILD_FORTRAN}" = "Xyes"; then
+- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
+- fi
+-fi
+-
+-AC_PROG_INSTALL
+-AC_PROG_LN_S
+-
+-AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
+
+ AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
+
+@@ -847,11 +833,6 @@
+ ## ------------------------------------------------------------------------
+ ## Check to see if libtool has enabled shared libraries. Set a conditional
+ ## as some Makefiles will build based on availability of shared libraries.
+-if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
+- enable_shared=yes
+-else
+- enable_shared=no
+-fi
+
+ ## ------------------------------------------------------------------------
+ ## Specify shared library extension the host machine should recognize.
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
new file mode 100644
index 0000000..f6f1554
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
@@ -0,0 +1,120 @@
+diff -Nur hdf-4.2.11.orig/hdf/examples/Makefile.am hdf-4.2.11/hdf/examples/Makefile.am
+--- hdf-4.2.11.orig/hdf/examples/Makefile.am 2016-03-16 20:07:45.103492925 +0000
++++ hdf-4.2.11/hdf/examples/Makefile.am 2016-03-16 22:16:35.836304451 +0000
+@@ -46,8 +46,8 @@
+ INSTALL_TOP_FILES = README
+
+ # Where to install example files
+-EXAMPLEDIR=$(prefix)/examples/c
+-EXAMPLETOPDIR=$(prefix)/examples
++EXAMPLEDIR=$(docdir)/examples/c
++EXAMPLETOPDIR=$(docdir)/examples
+
+ # How to build C programs using h4cc
+ $(EXTRA_PROG): $(H4CC)
+diff -Nur hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am hdf-4.2.11/hdf/fortran/examples/Makefile.am
+--- hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am 2016-03-16 20:07:45.103492925 +0000
++++ hdf-4.2.11/hdf/fortran/examples/Makefile.am 2016-03-16 22:17:58.775261767 +0000
+@@ -41,7 +41,7 @@
+ INSTALL_SCRIPT_FILES = run-fortran-ex.sh
+
+ # Where to install Fortran example files
+-EXAMPLEDIR=$(prefix)/examples/fortran
++EXAMPLEDIR=$(docdir)/examples/fortran
+
+ # How to build Fortran programs using h4fc
+ $(EXTRA_PROG): $(H4FC)
+diff -Nur hdf-4.2.11.orig/mfhdf/examples/Makefile.am hdf-4.2.11/mfhdf/examples/Makefile.am
+--- hdf-4.2.11.orig/mfhdf/examples/Makefile.am 2016-03-16 20:07:45.183491919 +0000
++++ hdf-4.2.11/mfhdf/examples/Makefile.am 2016-03-16 22:18:38.304764814 +0000
+@@ -23,7 +23,7 @@
+ SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c \
+ SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
+
+-EXAMPLEDIR=$(prefix)/examples/c
++EXAMPLEDIR=$(docdir)/examples/c
+
+ # How to build programs using h4cc
+ $(EXTRA_PROG): $(H4CC)
+diff -Nur hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am hdf-4.2.11/mfhdf/fortran/examples/Makefile.am
+--- hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am 2016-03-16 20:07:45.183491919 +0000
++++ hdf-4.2.11/mfhdf/fortran/examples/Makefile.am 2016-03-16 22:18:15.075056851 +0000
+@@ -24,7 +24,7 @@
+ SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
+
+ # Where to install example files
+-EXAMPLEDIR=$(prefix)/examples/fortran
++EXAMPLEDIR=$(docdir)/examples/fortran
+
+ # How to build Fortran programs using h4fc
+ $(EXTRA_PROG): $(H4FC)
+diff -up hdf-4.2.11/config/examples.am.destdir hdf-4.2.11/config/examples.am
+--- hdf-4.2.11/config/examples.am.destdir 2015-02-09 09:43:05.000000000 -0700
++++ hdf-4.2.11/config/examples.am 2015-02-13 13:24:09.008230956 -0700
+@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
+ CLEANFILES=$(EXAMPLE_PROG)
+
+ # How to create EXAMPLEDIR if it doesn't already exist
+-$(EXAMPLEDIR):
++$(DESTDIR)$(EXAMPLEDIR):
+ mkdir -p $@
+
+ # Install and uninstall rules. We install the source files, not the
+@@ -54,42 +54,42 @@ install-data-local:
+ uninstall-local:
+ @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
+
+-install-examples: $(EXAMPLEDIR)
++install-examples: $(DESTDIR)$(EXAMPLEDIR)
+ @for f in X $(INSTALL_FILES); do \
+ if test $$f != X; then \
+- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
+- chmod a-x $(EXAMPLEDIR)/$$f; \
++ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
++ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
+ fi; \
+ done
+ @for f in X $(INSTALL_SCRIPT_FILES); do \
+ if test $$f != X; then \
+- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
++ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
+ fi; \
+ done
+ @for f in X $(INSTALL_TOP_FILES); do \
+ if test $$f != X; then \
+- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
+- chmod a-x $(EXAMPLETOPDIR)/$$f; \
++ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
++ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
+ fi; \
+ done
+ @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
+ if test $$f != X; then \
+- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
++ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
+ fi; \
+ done
+
+ uninstall-examples:
+- @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \
+- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
++ @if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \
++ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
+ fi
+- @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then \
+- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \
++ @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \
++ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \
+ fi
+- @if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then \
+- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \
++ @if test -n "$(INSTALL_TOP_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \
++ set -x; cd $$(DESTDIR)(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \
+ fi
+- @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
+- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \
++ @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \
++ set -x; cd $(DESTDIR)$(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \
+ fi
+
+ installcheck-local:
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
new file mode 100644
index 0000000..4486eb9
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
@@ -0,0 +1,27 @@
+--- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000
++++ hdf-4.2.11/configure.ac 2016-03-16 22:08:06.232711036 +0000
+@@ -473,12 +473,14 @@
+ yes)
+ HAVE_SZIP="yes"
+ AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP])
+- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
++ if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
+ AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
+ fi
+
+ if test -z "$HAVE_SZIP"; then
+ AC_MSG_ERROR([couldn't find szlib library])
++ else
++ USE_COMP_SZIP="yes"
+ fi
+ ;;
+ no)
+@@ -525,7 +527,7 @@
+ AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
+ fi
+
+- if test -z "$HAVE_SZIP"; then
++ if test "x$HAVE_SZIP" != "xyes"; then
+ AC_MSG_ERROR([couldn't find szlib library])
+ else
+ USE_COMP_SZIP="yes"
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
new file mode 100644
index 0000000..d12e40d
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+MYP=${P/_p/-patch}
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+
+SLOT="0"
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="
+ sys-libs/zlib
+ virtual/jpeg:0
+ szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+ test? ( virtual/szip )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
+ "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
+ "${FILESDIR}"/${PN}-4.2.11-fix-examples-dir.patch
+)
+
+src_prepare() {
+ default
+ sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+ eautoreconf
+ [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+}
+
+src_configure() {
+ econf \
+ --enable-shared \
+ --enable-production=gentoo \
+ --disable-netcdf \
+ $(use_enable fortran) \
+ $(use_enable static-libs static) \
+ $(use_with szip szlib) \
+ CC="$(tc-getCC)"
+}
+
+src_install() {
+ default
+ use static-libs || prune_libtool_files --all
+ dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+ cd "${ED}"usr
+ use examples || rm -rf share/doc/${PF}/examples
+ mv bin/ncgen{,-hdf} || die
+ mv bin/ncdump{,-hdf} || die
+ mv share/man/man1/ncgen{,-hdf}.1 || die
+ mv share/man/man1/ncdump{,-hdf}.1 || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/
@ 2021-01-17 11:52 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2021-01-17 11:52 UTC (permalink / raw
To: gentoo-commits
commit: 1da7f8cbf1a9b8d6a36886efab8e4bb6e779e1e9
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 17 11:51:23 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:51:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da7f8cb
sci-libs/hdf: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/hdf/Manifest | 1 -
.../hdf/files/hdf-4.2.11-fix-examples-dir.patch | 120 ---------------------
sci-libs/hdf/hdf-4.2.11.ebuild | 66 ------------
3 files changed, 187 deletions(-)
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 5fbf047ece6..e10b0af4e45 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,2 +1 @@
-DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
deleted file mode 100644
index f6f15545d66..00000000000
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Nur hdf-4.2.11.orig/hdf/examples/Makefile.am hdf-4.2.11/hdf/examples/Makefile.am
---- hdf-4.2.11.orig/hdf/examples/Makefile.am 2016-03-16 20:07:45.103492925 +0000
-+++ hdf-4.2.11/hdf/examples/Makefile.am 2016-03-16 22:16:35.836304451 +0000
-@@ -46,8 +46,8 @@
- INSTALL_TOP_FILES = README
-
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/c
--EXAMPLETOPDIR=$(prefix)/examples
-+EXAMPLEDIR=$(docdir)/examples/c
-+EXAMPLETOPDIR=$(docdir)/examples
-
- # How to build C programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am hdf-4.2.11/hdf/fortran/examples/Makefile.am
---- hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am 2016-03-16 20:07:45.103492925 +0000
-+++ hdf-4.2.11/hdf/fortran/examples/Makefile.am 2016-03-16 22:17:58.775261767 +0000
-@@ -41,7 +41,7 @@
- INSTALL_SCRIPT_FILES = run-fortran-ex.sh
-
- # Where to install Fortran example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
-
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -Nur hdf-4.2.11.orig/mfhdf/examples/Makefile.am hdf-4.2.11/mfhdf/examples/Makefile.am
---- hdf-4.2.11.orig/mfhdf/examples/Makefile.am 2016-03-16 20:07:45.183491919 +0000
-+++ hdf-4.2.11/mfhdf/examples/Makefile.am 2016-03-16 22:18:38.304764814 +0000
-@@ -23,7 +23,7 @@
- SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c \
- SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
-
--EXAMPLEDIR=$(prefix)/examples/c
-+EXAMPLEDIR=$(docdir)/examples/c
-
- # How to build programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am hdf-4.2.11/mfhdf/fortran/examples/Makefile.am
---- hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am 2016-03-16 20:07:45.183491919 +0000
-+++ hdf-4.2.11/mfhdf/fortran/examples/Makefile.am 2016-03-16 22:18:15.075056851 +0000
-@@ -24,7 +24,7 @@
- SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
-
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
-
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -up hdf-4.2.11/config/examples.am.destdir hdf-4.2.11/config/examples.am
---- hdf-4.2.11/config/examples.am.destdir 2015-02-09 09:43:05.000000000 -0700
-+++ hdf-4.2.11/config/examples.am 2015-02-13 13:24:09.008230956 -0700
-@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
- CLEANFILES=$(EXAMPLE_PROG)
-
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- mkdir -p $@
-
- # Install and uninstall rules. We install the source files, not the
-@@ -54,42 +54,42 @@ install-data-local:
- uninstall-local:
- @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-
--install-examples: $(EXAMPLEDIR)
-+install-examples: $(DESTDIR)$(EXAMPLEDIR)
- @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLEDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
- fi; \
- done
- @for f in X $(INSTALL_TOP_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-- chmod a-x $(EXAMPLETOPDIR)/$$f; \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
- fi; \
- done
- @for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
- if test $$f != X; then \
-- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- fi; \
- done
-
- uninstall-examples:
-- @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \
-- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
-+ @if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \
-+ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
- fi
-- @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then \
-- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \
-+ @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \
-+ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \
- fi
-- @if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then \
-- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \
-+ @if test -n "$(INSTALL_TOP_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \
-+ set -x; cd $$(DESTDIR)(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \
- fi
-- @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
-- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \
-+ @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \
-+ set -x; cd $(DESTDIR)$(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \
- fi
-
- installcheck-local:
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
deleted file mode 100644
index e898f4d0737..00000000000
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
- sys-libs/zlib
- virtual/jpeg:0
- szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
- test? ( virtual/szip )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
- "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
- "${FILESDIR}"/${PN}-4.2.11-fix-examples-dir.patch
-)
-
-src_prepare() {
- default
- sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
- eautoreconf
- [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
- econf \
- --enable-shared \
- --enable-production=gentoo \
- --disable-netcdf \
- $(use_enable fortran) \
- $(use_enable static-libs static) \
- $(use_with szip szlib) \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- default
- use static-libs || prune_libtool_files --all
- dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
- cd "${ED}"usr
- use examples || rm -rf share/doc/${PF}/examples
- mv bin/ncgen{,-hdf} || die
- mv bin/ncdump{,-hdf} || die
- mv share/man/man1/ncgen{,-hdf}.1 || die
- mv share/man/man1/ncdump{,-hdf}.1 || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/
@ 2022-01-09 23:04 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-01-09 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 92ea2e6dce27c52e8f8039bf0c60fd85f89d8e10
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 22:21:20 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 9 23:04:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ea2e6d
sci-libs/hdf: Drop 4.2.13-r1 and 4.2.15 (r0)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/hdf/Manifest | 1 -
.../files/hdf-4.2.11-enable-fortran-shared.patch | 35 ---------
.../hdf/files/hdf-4.2.11-fix-szip-detection.patch | 27 -------
.../hdf/files/hdf-4.2.13-fix-xdr-configure.patch | 13 ----
sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch | 29 --------
sci-libs/hdf/hdf-4.2.13-r1.ebuild | 83 ----------------------
sci-libs/hdf/hdf-4.2.15.ebuild | 77 --------------------
7 files changed, 265 deletions(-)
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f263bbc2c62b..d44550729bb1 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,3 +1,2 @@
-DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B 461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff SHA512 616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67
DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6 SHA512 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
diff --git a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
deleted file mode 100644
index 7d48a8a0ca97..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000
-+++ hdf-4.2.11/configure.ac 2016-03-16 20:15:56.767311873 +0000
-@@ -224,20 +224,6 @@
- ## Build static libraries by default. Furthermore, fortran shared libraries
- ## are unsupported. Disallow a user from enabling both shared libraries and
- ## fortran.
--if test "X${enable_shared}" != "Xyes"; then
-- enable_shared="no"
--fi
--
--if test "X${enable_shared}" = "Xyes"; then
-- if test "X${BUILD_FORTRAN}" = "Xyes"; then
-- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.])
-- fi
--fi
--
--AC_PROG_INSTALL
--AC_PROG_LN_S
--
--AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
-
- AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
-
-@@ -847,11 +833,6 @@
- ## ------------------------------------------------------------------------
- ## Check to see if libtool has enabled shared libraries. Set a conditional
- ## as some Makefiles will build based on availability of shared libraries.
--if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
-- enable_shared=yes
--else
-- enable_shared=no
--fi
-
- ## ------------------------------------------------------------------------
- ## Specify shared library extension the host machine should recognize.
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
deleted file mode 100644
index 4486eb959b82..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000
-+++ hdf-4.2.11/configure.ac 2016-03-16 22:08:06.232711036 +0000
-@@ -473,12 +473,14 @@
- yes)
- HAVE_SZIP="yes"
- AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP])
-- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-+ if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- fi
-
- if test -z "$HAVE_SZIP"; then
- AC_MSG_ERROR([couldn't find szlib library])
-+ else
-+ USE_COMP_SZIP="yes"
- fi
- ;;
- no)
-@@ -525,7 +527,7 @@
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- fi
-
-- if test -z "$HAVE_SZIP"; then
-+ if test "x$HAVE_SZIP" != "xyes"; then
- AC_MSG_ERROR([couldn't find szlib library])
- else
- USE_COMP_SZIP="yes"
diff --git a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
deleted file mode 100644
index a4514ab267ec..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hdf-4.2.13/configure.ac
-===================================================================
---- hdf-4.2.13.orig/configure.ac
-+++ hdf-4.2.13/configure.ac
-@@ -676,7 +676,7 @@ case "$host" in
- *) ;;
- esac
-
--if test "X$BUILD_XDR" != "Xyes"; then
-+if test "X$BUILD_XDR" = "Xyes"; then
- AC_TRY_LINK([
- #include <rpc/types.h>
- #include <rpc/xdr.h>], [xdr_int],
diff --git a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
deleted file mode 100644
index 963388f66982..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: hdf-4.2.13/configure.ac
-===================================================================
---- hdf-4.2.13.orig/configure.ac
-+++ hdf-4.2.13/configure.ac
-@@ -673,6 +673,9 @@ case "$host" in
- *-pc-cygwin*)
- LIBS="$LIBS -ltirpc"
- CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;;
-+ *-pc-linux*)
-+ LIBS="$LIBS -ltirpc"
-+ CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;;
- *) ;;
- esac
-
-@@ -703,6 +706,14 @@ if test "X$BUILD_XDR" != "Xyes"; then
- HAVE_RPC="yes"
- AC_CHECK_HEADER([rpc.h],[:], [unset HAVE_RPC])
- AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
-+ if test -z "$HAVE_RPC"; then
-+ AC_MSG_ERROR([couldn't find tirpc library])
-+ fi
-+ ;;
-+ *-pc-linux*)
-+ HAVE_RPC="yes"
-+ AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_RPC])
-+ AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
- if test -z "$HAVE_RPC"; then
- AC_MSG_ERROR([couldn't find tirpc library])
- fi
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
deleted file mode 100644
index cf5dc153dc11..000000000000
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ~ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
- net-libs/libtirpc
- sys-libs/zlib
- virtual/jpeg:0
- szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
- test? ( virtual/szip )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
- "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
- "${FILESDIR}"/${PN}-4.2.13-fix-xdr-configure.patch
- "${FILESDIR}"/${PN}-4.2.13-linux-tirpc.patch
-)
-
-src_prepare() {
- default
- sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
- eautoreconf
-}
-
-src_configure() {
- [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
- # GCC 10 workaround
- # bug #723014
- append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
- econf \
- --enable-shared \
- --enable-production=gentoo \
- --disable-netcdf \
- $(use_enable fortran) \
- $(use_enable static-libs static) \
- $(use_with szip szlib) \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-
- cd "${ED}"usr
- if use examples; then
- mv share/hdf4_examples share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r share/hdf4_examples || die
- fi
-
- mv bin/ncgen{,-hdf} || die
- mv bin/ncdump{,-hdf} || die
- mv share/man/man1/ncgen{,-hdf}.1 || die
- mv share/man/man1/ncdump{,-hdf}.1 || die
-}
diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
deleted file mode 100644
index 7f129df09b6b..000000000000
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
-SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ~ia64 ~ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
- net-libs/libtirpc
- sys-libs/zlib
- virtual/jpeg:0
- szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
- test? ( virtual/szip )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.2.15-enable-fortran-shared.patch
- "${FILESDIR}"/${PN}-4.2.15-fix-rpch-location.patch
-)
-
-src_prepare() {
- default
- sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
- eautoreconf
-}
-
-src_configure() {
- [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
- # GCC 10 workaround
- # bug #723014
- append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
- econf \
- --enable-shared \
- --enable-production=gentoo \
- --disable-netcdf \
- $(use_enable fortran) \
- $(use_enable static-libs static) \
- $(use_with szip szlib) \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-
- cd "${ED}/usr" || die
- if use examples; then
- mv share/hdf4_examples share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r share/hdf4_examples || die
- fi
-
- mv bin/ncgen{,-hdf} || die
- mv bin/ncdump{,-hdf} || die
- mv share/man/man1/ncgen{,-hdf}.1 || die
- mv share/man/man1/ncdump{,-hdf}.1 || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/
@ 2024-04-08 5:24 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-04-08 5:24 UTC (permalink / raw
To: gentoo-commits
commit: 24a7e5c2de5100a0b6124fc3fa61b8914c36e0c1
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Apr 8 03:21:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 05:21:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a7e5c2
sci-libs/hdf: drop painful dead weight
I am not fighting with Modern C more than I have to, so just prune this.
The key here is that upstream hdf4 doesn't support it and doesn't want
you using it, because it appears to just be an uplifted copy of netcdf
code. So why not, erm, just use netcdf?
Good question, and this package doesn't have an answer to that. Yeet
these vendored tools into the sunset. No need to rename them to private
copies.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...do-not-build-the-mfhdf-tools-ncgen-ncdump.patch | 30 ++++++++++++++++++++++
sci-libs/hdf/hdf-4.2.15-r2.ebuild | 8 +++---
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
new file mode 100644
index 000000000000..c57481a6cb84
--- /dev/null
+++ b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
@@ -0,0 +1,30 @@
+From 5a93f7ba5bea12bd78616a2168035324054ed7b7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 23:11:43 -0400
+Subject: [PATCH] simply do not build the mfhdf tools ncgen/ncdump
+
+They were removed upstream in:
+https://github.com/HDFGroup/hdf4/commit/57b87b9927f0127d0d04ab7cd6c93e01bf54e3ee
+
+With the note that people who want them can get them from... yup, you
+guessed it, netcdf.
+---
+ mfhdf/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mfhdf/Makefile.am b/mfhdf/Makefile.am
+index d62d3af..0963923 100644
+--- a/mfhdf/Makefile.am
++++ b/mfhdf/Makefile.am
+@@ -17,7 +17,7 @@ FORTRAN_DIR =
+ endif
+
+ # src folder in root Makefile, build other folders now
+-SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test ncdump ncgen dumper hdfimport hdiff hrepack nctest
++SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test dumper hdfimport hdiff hrepack nctest
+
+ DIST_SUBDIRS = xdr libsrc fortran test ncdump ncgen dumper hdfimport hdiff hrepack nctest examples
+
+--
+2.43.2
+
diff --git a/sci-libs/hdf/hdf-4.2.15-r2.ebuild b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
index 6e762b25fff0..01a74e03df73 100644
--- a/sci-libs/hdf/hdf-4.2.15-r2.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
@@ -37,6 +37,9 @@ PATCHES=(
# backport fix for Modern C
"${FILESDIR}"/hdf4-c99.patch
+
+ # These tools were dropped upstream. Get them from netcdf...
+ "${FILESDIR}"/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
)
src_prepare() {
@@ -78,9 +81,4 @@ src_install() {
else
rm -r share/hdf4_examples || die
fi
-
- mv bin/ncgen{,-hdf} || die
- mv bin/ncdump{,-hdf} || die
- mv share/man/man1/ncgen{,-hdf}.1 || die
- mv share/man/man1/ncdump{,-hdf}.1 || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-08 5:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-08 5:24 [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-01-09 23:04 Andreas Sturmlechner
2021-01-17 11:52 David Seifert
2016-03-18 19:18 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox