diff options
| author |   David Seifert <soap@gentoo.org> | 2021-03-07 14:57:39 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2021-03-07 14:57:39 +0100 |
| commit | aebc40c5fc6fb148368a4cfeb825da2440f7f69a (patch) | |
| tree | 55843a6e21d216a487bfb3a2ec0ed7e279f25e39 /sci-misc | |
| parent | net-misc/dropbox: drop old (diff) | |
| download | gentoo-aebc40c5fc6fb148368a4cfeb825da2440f7f69a.tar.gz gentoo-aebc40c5fc6fb148368a4cfeb825da2440f7f69a.tar.bz2 gentoo-aebc40c5fc6fb148368a4cfeb825da2440f7f69a.zip | |
sci-misc/h5utils: Fix automagic patch
Closes: https://bugs.gentoo.org/767064
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Suggested-by: Attila Tóth <atoth@atoth.sote.hu>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch index 7c166040cb48..81e7d8a5b605 100644 --- a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch +++ b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch @@ -19,24 +19,7 @@ - H4TOH5="h4toh5" - H5TOH4="h5toh4" -fi -+AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present])) -+ -+AS_IF([test "x$with_hdf" = "xyes"], [ -+ AC_CHECK_HEADERS(hdf.h hdf/hdf.h) -+ AC_CHECK_LIB(jpeg, jpeg_start_compress, -+ [AC_CHECK_LIB(df, DFSDgetdata, -+ [H4_LIBS="-ldf -ljpeg"; HDF4=yes], -+ [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], -+ [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) -+ if test $HDF4 = yes; then -+ MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" -+ MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS" -+ MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" -+ fi -+ -+ AC_SUBST(H4_LIBS) -+]) - +- -HDF4=no -if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then - AC_CHECK_LIB(jpeg, jpeg_start_compress, @@ -57,6 +40,24 @@ - fi -fi -AC_CHECK_HEADERS(hdf.h hdf/hdf.h) ++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present])) ++ ++AS_IF([test "x$with_hdf" = "xyes"], [ ++ AC_CHECK_HEADERS(hdf.h hdf/hdf.h) ++ AC_CHECK_LIB(jpeg, jpeg_start_compress, ++ [AC_CHECK_LIB(df, DFSDgetdata, ++ [H4_LIBS="-ldf -ljpeg"; HDF4=yes], ++ [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)], ++ [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])]) ++ if test $HDF4 = yes; then ++ MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS" ++ MORE_H5UTILS_MANS="doc/man/h5fromh4.1 $MORE_H5UTILS_MANS" ++ MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS" ++ fi ++ ++ AC_SUBST(H4_LIBS) ++]) ++ -AC_SUBST(H4_LIBS) |