gnu: hdf4: Build with libtirpc.
* gnu/packages/patches/hdf4-tirpc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/maths.scm (hdf4)[source](patches): Use it. [inputs]: Add LIBTIRPC. [arguments]: Adjust #:configure-flags accordingly.
This commit is contained in:
parent
0481289cbc
commit
bd3d71cb16
|
@ -944,6 +944,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/hdf4-architectures.patch \
|
%D%/packages/patches/hdf4-architectures.patch \
|
||||||
%D%/packages/patches/hdf4-reproducibility.patch \
|
%D%/packages/patches/hdf4-reproducibility.patch \
|
||||||
%D%/packages/patches/hdf4-shared-fortran.patch \
|
%D%/packages/patches/hdf4-shared-fortran.patch \
|
||||||
|
%D%/packages/patches/hdf4-tirpc.patch \
|
||||||
%D%/packages/patches/hdf5-config-date.patch \
|
%D%/packages/patches/hdf5-config-date.patch \
|
||||||
%D%/packages/patches/hdf5-mpi-deprecations.patch \
|
%D%/packages/patches/hdf5-mpi-deprecations.patch \
|
||||||
%D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \
|
%D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \
|
||||||
|
|
|
@ -100,6 +100,7 @@
|
||||||
#:use-module (gnu packages mpi)
|
#:use-module (gnu packages mpi)
|
||||||
#:use-module (gnu packages multiprecision)
|
#:use-module (gnu packages multiprecision)
|
||||||
#:use-module (gnu packages netpbm)
|
#:use-module (gnu packages netpbm)
|
||||||
|
#:use-module (gnu packages onc-rpc)
|
||||||
#:use-module (gnu packages pcre)
|
#:use-module (gnu packages pcre)
|
||||||
#:use-module (gnu packages popt)
|
#:use-module (gnu packages popt)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
|
@ -684,7 +685,8 @@ computations.")
|
||||||
(base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm"))
|
(base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm"))
|
||||||
(patches (search-patches "hdf4-architectures.patch"
|
(patches (search-patches "hdf4-architectures.patch"
|
||||||
"hdf4-reproducibility.patch"
|
"hdf4-reproducibility.patch"
|
||||||
"hdf4-shared-fortran.patch"))))
|
"hdf4-shared-fortran.patch"
|
||||||
|
"hdf4-tirpc.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gfortran" ,gfortran)
|
`(("gfortran" ,gfortran)
|
||||||
|
@ -692,10 +694,14 @@ computations.")
|
||||||
("flex" ,flex)))
|
("flex" ,flex)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("zlib" ,zlib)
|
`(("zlib" ,zlib)
|
||||||
("libjpeg" ,libjpeg)))
|
("libjpeg" ,libjpeg)
|
||||||
|
("libtirpc" ,libtirpc)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-tests? #f
|
`(#:parallel-tests? #f
|
||||||
#:configure-flags '("--enable-shared")
|
#:configure-flags (list "--enable-shared"
|
||||||
|
(string-append "CPPFLAGS=-I"
|
||||||
|
(assoc-ref %build-inputs "libtirpc")
|
||||||
|
"/include/tirpc"))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
;; This is inspired by two of Debian's patches.
|
;; This is inspired by two of Debian's patches.
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
Build with libtirpc on all architectures because glibc no longer provides
|
||||||
|
SunRPC support.
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -23635,10 +23635,13 @@
|
||||||
|
*-pc-cygwin*)
|
||||||
|
LIBS="$LIBS -ltirpc"
|
||||||
|
CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;;
|
||||||
|
+ *-linux-gnu)
|
||||||
|
+ LIBS="$LIBS -ltirpc"
|
||||||
|
+ CPPFLAGS="$CPPFLAGS" ;;
|
||||||
|
*) ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
-if test "X$BUILD_XDR" != "Xyes"; then
|
||||||
|
+if test "X$BUILD_XDR" = "Xyes"; then
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
@@ -23693,9 +23696,9 @@
|
||||||
|
## but we need to make sure that it is present on the system. Do that here,
|
||||||
|
## The SunRPC of the glibc has been replaced by a TI-RPC (Transport Independent RPC) library for IPv6 support
|
||||||
|
case "$host" in
|
||||||
|
- *-pc-cygwin*)
|
||||||
|
+ *)
|
||||||
|
HAVE_RPC="yes"
|
||||||
|
- ac_fn_c_check_header_mongrel "$LINENO" "rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default"
|
||||||
|
+ ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default"
|
||||||
|
if test "x$ac_cv_header_rpc_h" = xyes; then :
|
||||||
|
:
|
||||||
|
else
|
Loading…
Reference in New Issue