From e77412362f8217eaa9afa34f44a4b85aba23e91f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:59:25 +0200 Subject: gnu: OpenBLAS: Update to 0.3.6. * gnu/packages/maths.scm (openblas): Update to 0.3.6. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d59028599f..49c8de8979 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2973,7 +2973,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.5") + (version "0.3.6") (source (origin (method url-fetch) @@ -2982,7 +2982,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "062kg4ny1ywz7k5grpb4pbf0hba0w6manbajwkmv4f477a31sxpl")))) + "1r2g9zzwq5dm8vjd19pxwggfvfzy56cvkmpmp5d014qr3svgmsap")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 97149c576762de7fd8e1a6ac8f46c97d3490b360 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 18:13:34 +0200 Subject: gnu: Adjust uses of C{,PLUS}_INCLUDE_PATH for GCC 7. These variables are no longer set in the build environment by default. GCC still respects these search paths and treats them as "system headers" so we can continue to use them, just not expect them to be available. * gnu/packages/mpi.scm (openmpi)[arguments]: Do not attempt to read from C_INCLUDE_PATH, nor CPLUS_INCLUDE_PATH. * gnu/packages/games.scm (kiki)[arguments]: Likewise. * gnu/packages/networking.scm (hcxtools)[arguments]: Likewise. * gnu/packages/synergy.scm (synergy)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (gemma, sailfish)[arguments]: Likewise. * gnu/packages/maths.scm (dune-alugrid)[arguments]: Likewise. --- gnu/packages/bioinformatics.scm | 8 ++------ gnu/packages/games.scm | 3 +-- gnu/packages/maths.scm | 3 +-- gnu/packages/mpi.scm | 6 ++---- gnu/packages/networking.scm | 3 +-- gnu/packages/synergy.scm | 3 +-- 6 files changed, 8 insertions(+), 18 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 92bc532196..0dcbb94666 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3260,9 +3260,7 @@ comment or quality sections.") (lambda* (#:key inputs #:allow-other-keys) ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") - ":" - (assoc-ref inputs "eigen") + (string-append (assoc-ref inputs "eigen") "/include/eigen3")) #t)) (add-before 'build 'bin-mkdir @@ -11697,9 +11695,7 @@ bytes of memory space, where n is the length of the string.") ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") - ":" - (assoc-ref inputs "eigen") + (string-append (assoc-ref inputs "eigen") "/include/eigen3")) #t))))) (inputs diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b6a63aba02..6e54abc5d0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4175,8 +4175,7 @@ over 100 user-created campaigns.") (string-append (assoc-ref inputs "sdl-union") "/include/SDL:" (assoc-ref inputs "python") - "/include/python2.7:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/python2.7")) (substitute* "src/main/main.cpp" (("#include " line) (string-append line " diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index df8bad13e0..3f9cd8be6e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4740,8 +4740,7 @@ assemble global function spaces on finite-element grids.") (add-after 'build 'build-tests (lambda* (#:key inputs make-flags #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share:" - (getenv "CPLUS_INCLUDE_PATH"))) + (string-append (assoc-ref inputs "dune-grid") "/share")) (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index c9cd7b1382..c02e1d2e2b 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -217,12 +217,10 @@ bind processes, and much more.") (lambda* (#:key inputs #:allow-other-keys) (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "opensm") - "/include/infiniband/:" - (getenv "C_INCLUDE_PATH"))) + "/include/infiniband")) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "opensm") - "/include/infiniband/:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/infiniband")) #t)) (add-before 'build 'remove-absolute (lambda _ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 53c11f6d95..ce9afaf16d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2289,8 +2289,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") (string-append (assoc-ref inputs "curl") "/include:" (assoc-ref inputs "libpcap") "/include:" (assoc-ref inputs "openssl") "/include:" - (assoc-ref inputs "zlib") "/include:" - (getenv "C_INCLUDE_PATH"))) + (assoc-ref inputs "zlib") "/include")) #t))))) (home-page "https://github.com/ZerBea/hcxtools") (synopsis "Capture wlan traffic to hashcat and John the Ripper") diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index da8787285f..9de3ee57e4 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -63,8 +63,7 @@ (lambda* (#:key inputs #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "avahi") - "/include/avahi-compat-libdns_sd/:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/avahi-compat-libdns_sd")) ;; See https://github.com/symless/synergy-core/pull/6359/ (substitute* "src/gui/src/ScreenSetupView.cpp" (("#include " m) -- cgit v1.2.3 From bd3d71cb16de546b534be7a3d03880922f6a1c07 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 13:15:30 +0200 Subject: 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. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 12 +++++++++--- gnu/packages/patches/hdf4-tirpc.patch | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/hdf4-tirpc.patch (limited to 'gnu/packages/maths.scm') diff --git a/gnu/local.mk b/gnu/local.mk index fe476534c2..b40472709f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -944,6 +944,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.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-mpi-deprecations.patch \ %D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38bb81242f..9e515fd3d1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -100,6 +100,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages netpbm) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pcre) #:use-module (gnu packages popt) #:use-module (gnu packages perl) @@ -684,7 +685,8 @@ computations.") (base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm")) (patches (search-patches "hdf4-architectures.patch" "hdf4-reproducibility.patch" - "hdf4-shared-fortran.patch")))) + "hdf4-shared-fortran.patch" + "hdf4-tirpc.patch")))) (build-system gnu-build-system) (native-inputs `(("gfortran" ,gfortran) @@ -692,10 +694,14 @@ computations.") ("flex" ,flex))) (inputs `(("zlib" ,zlib) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg) + ("libtirpc" ,libtirpc))) (arguments `(#:parallel-tests? #f - #:configure-flags '("--enable-shared") + #:configure-flags (list "--enable-shared" + (string-append "CPPFLAGS=-I" + (assoc-ref %build-inputs "libtirpc") + "/include/tirpc")) #:phases (modify-phases %standard-phases ;; This is inspired by two of Debian's patches. diff --git a/gnu/packages/patches/hdf4-tirpc.patch b/gnu/packages/patches/hdf4-tirpc.patch new file mode 100644 index 0000000000..3f436e3887 --- /dev/null +++ b/gnu/packages/patches/hdf4-tirpc.patch @@ -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 -- cgit v1.2.3 From 25bdbb618a4947e8d5dcf14c440bf58fad58165f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 18:49:32 +0200 Subject: gnu: hdf-eos2: Add libtirpc input. * gnu/packages/maths.scm (hdf-eos2)[inputs]: Add LIBTIRPC. --- gnu/packages/maths.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9e515fd3d1..5735c17bc6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1050,8 +1050,11 @@ implemented in C.") `(("gfortran" ,gfortran))) (inputs `(("hdf4" ,hdf4-alt) ; assume most HDF-EOS2 users won't use the HDF4 netCDF API + ;; XXX: These inputs are really dependencies of hdf4. ("zlib" ,zlib) ("libjpeg" ,libjpeg) + ("libtirpc" ,libtirpc) + ("gctp" ,gctp))) (arguments `( #:configure-flags '("--enable-install-include" "--enable-shared" -- cgit v1.2.3