From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WDb8M/3G42SGDAEASxT56A (envelope-from ) for ; Mon, 21 Aug 2023 22:20:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id ePhCM/3G42QM7QAAG6o9tA (envelope-from ) for ; Mon, 21 Aug 2023 22:20:13 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F35B338BD0 for ; Mon, 21 Aug 2023 22:20:12 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692649213; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VXSd4cKTnqymHdENHaR/SckzYlQ4GNKb51RPMPqgoOs=; b=MjJXAOBJBynxbv5BgCOKAgVGjVf7LpAJhwDYeOxbqNBL5CI0JNVk4mvZiKY1/ODx3rLyIf vvy+jndjvHTlymkmtR1SI3wwyYef+qXca2hypAP7E+KPFaw4k4IHZ9w2k/TZNCJn0J+boA LieJbsGvwIsMYtsjLlVT+tBHUJ3n5gK/lM/Kx2DSMB+N+Ah3zLJUebQW0ee8aFMGknItAh dEqp5//eUph19Q+f9TnQo1N9R6Y4/y/QdqzhIoSw5mW86OWVt+Ca6RG7PY49FVfIZAHROE E5i5+Ydcm98OpbdhjIHBSLScrRCq+0eODyV4h8keqBAkSyVluMVZThk01Dlvlg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692649213; a=rsa-sha256; cv=none; b=iNeWf4wK7FjP2grnHgf0bQrXkQ607b3xTQi33wt5X5Rszma20au/N6KHUmAtaut4jMNCDv TYnP+n+mPowghsNoswrL6AiOL2PULBKRxnUlwRNZECchXWjal1Hx/sYdZFA1d+hSaxh3pf IRn4K5c9po3h31Ud8psRpi09eg+mG33K4ehXFVkH74ZkMWG0HcwhlfWvn1ULlKxUc+nQKV 2iHlgU+T/HZQVQ0i0QVogU66DiNOOvPIPVBBl6g11QrNnS95O65aBZK3TkAvr4G3QZNI1Z A4QeZf5u8DwHx/b/hZ+s0LrUZlIVVBdHwj98d6PM+LC+a4U4Y9Nkzd8UYIFz7A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYBNc-0002LX-PW; Mon, 21 Aug 2023 16:20:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYBNa-0002L9-8i for guix-patches@gnu.org; Mon, 21 Aug 2023 16:20:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYBNZ-0006bq-TU for guix-patches@gnu.org; Mon, 21 Aug 2023 16:20:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYBNa-00058w-8U; Mon, 21 Aug 2023 16:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65443] [PATCH] gnu: hdf4, hdf4-alt: Update to 4.2.16-2. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Mon, 21 Aug 2023 20:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65443 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65443@debbugs.gnu.org Cc: Andreas Enge , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by submit@debbugs.gnu.org id=B.169264917619732 (code B ref -1); Mon, 21 Aug 2023 20:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Aug 2023 20:19:36 +0000 Received: from localhost ([127.0.0.1]:57989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYBN8-00058A-PC for submit@debbugs.gnu.org; Mon, 21 Aug 2023 16:19:36 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYBN4-00057t-Cf for submit@debbugs.gnu.org; Mon, 21 Aug 2023 16:19:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYBMv-0002E3-DW for guix-patches@gnu.org; Mon, 21 Aug 2023 16:19:22 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qYBMr-0006YL-3p for guix-patches@gnu.org; Mon, 21 Aug 2023 16:19:21 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id EC8DDE0D; Mon, 21 Aug 2023 22:19:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RgqKXFrYOm3g; Mon, 21 Aug 2023 22:19:10 +0200 (CEST) Received: from jurong.lan (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 17FE87FB; Mon, 21 Aug 2023 22:19:10 +0200 (CEST) From: Andreas Enge Date: Mon, 21 Aug 2023 22:18:30 +0200 Message-ID: <318fea2ce6c0e1fc1b268b526de2e0b2a89d27db.1692649110.git.andreas@enge.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.233.100.1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -5.20 X-Spam-Score: -5.20 X-Migadu-Queue-Id: F35B338BD0 X-TUID: 8Ny/ougtPbZs * gnu/packages/maths.scm (hdf4)[source]: Update to 4.2.16-2. Drop patches that do not apply any more. [arguments]: Drop configure flag related to libtirpc. Add configure flag to build xdr library and drop unneeded substitutions. * gnu/packages/patches/hdf4-architectures.patch, gnu/packages/patches/hdf4-tirpc.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Unregister patches. --- gnu/local.mk | 2 - gnu/packages/maths.scm | 28 +- gnu/packages/patches/hdf4-architectures.patch | 632 ------------------ gnu/packages/patches/hdf4-tirpc.patch | 33 - 4 files changed, 8 insertions(+), 687 deletions(-) delete mode 100644 gnu/packages/patches/hdf4-architectures.patch delete mode 100644 gnu/packages/patches/hdf4-tirpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 011ababfb7..a9acd493e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1363,10 +1363,8 @@ dist_patch_DATA = \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ - %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/hdf-eos2-build-shared.patch \ %D%/packages/patches/hdf-eos2-remove-gctp.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1666d6e420..b90746f7f6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Andreas Enge +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2023 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016, 2017 John Darrington ;;; Copyright © 2014-2022 Eric Bavier @@ -1321,18 +1321,16 @@ (define-public gctp (define-public hdf4 (package (name "hdf4") - (version "4.2.14") + (version "4.2.16-2") (source (origin (method url-fetch) (uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF" version "/src/hdf-" version ".tar.bz2")) (sha256 - (base32 "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l")) - (patches (search-patches "hdf4-architectures.patch" - "hdf4-reproducibility.patch" - "hdf4-shared-fortran.patch" - "hdf4-tirpc.patch")))) + (base32 "0b395czhqr43mmbiifmg2mhb488wnd4zccj45vpql98ja15j7hy5")) + (patches (search-patches "hdf4-reproducibility.patch" + "hdf4-shared-fortran.patch")))) (build-system gnu-build-system) (native-inputs (list gfortran bison flex)) @@ -1345,9 +1343,7 @@ (define-public hdf4 #:configure-flags (list "--enable-shared" "FCFLAGS=-fallow-argument-mismatch" "FFLAGS=-fallow-argument-mismatch" - (string-append "CPPFLAGS=-I" - (assoc-ref %build-inputs "libtirpc") - "/include/tirpc")) + "--enable-hdf4-xdr") #:phases (modify-phases %standard-phases ;; This is inspired by two of Debian's patches. @@ -1362,14 +1358,7 @@ (define-public hdf4 (substitute* '("mfhdf/hdfimport/testutil.sh.in" "hdf/util/testutil.sh.in") (("/bin/rm") "rm") - (("/bin/mkdir") "mkdir")) - (substitute* (find-files "." "^Makefile\\.in$") - (("@HDF_BUILD_XDR_TRUE@XDR_ADD = \ --R\\$\\(abs_top_builddir\\)/mfhdf/xdr/\\.libs") "") - (("@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = \ --R\\$\\(abs_top_builddir\\)/mfhdf/libsrc/\\.libs \ --R\\$\\(abs_top_builddir\\)/hdf/src/\\.libs \\$\\(XDR_ADD\\)") "")) - #t)) + (("/bin/mkdir") "mkdir")))) (add-after 'configure 'patch-settings (lambda _ ;; libhdf4.settings contains the full path of the @@ -1389,8 +1378,7 @@ (define-public hdf4 ;; files. Fix it manually to avoid having to propagate it. (substitute* (find-files (string-append out "/lib") "\\.la$") (("-ljpeg") - (string-append "-L" libjpeg "/lib -ljpeg"))) - #t)))))) + (string-append "-L" libjpeg "/lib -ljpeg"))))))))) (home-page "https://www.hdfgroup.org/products/hdf4/") (synopsis "Library and multi-object file format for storing and managing data") diff --git a/gnu/packages/patches/hdf4-architectures.patch b/gnu/packages/patches/hdf4-architectures.patch deleted file mode 100644 index aa71d5a383..0000000000 --- a/gnu/packages/patches/hdf4-architectures.patch +++ /dev/null @@ -1,632 +0,0 @@ -Copied from Debian. - -Description: Support additional architectures. -Author: Francesco Paolo Lovergine - ---- a/hdf/src/hdfi.h -+++ b/hdf/src/hdfi.h -@@ -48,6 +48,7 @@ - /* 8 - Cray IEEE */ - /* (i.e. Big-Endian, all 64-bit architecture w/IEEE Floats) */ - /*--------------------------------------------------------------------------*/ -+#define DFMT_S390 0x1111 - #define DFMT_SUN 0x1111 - #define DFMT_SUN_INTEL 0x4441 - #define DFMT_ALLIANT 0x1111 -@@ -62,6 +63,7 @@ - #define DFMT_CTSS 0x3331 - #define DFMT_VAX 0x2221 - #define DFMT_MIPSEL 0x4441 -+#define DFMT_MIPSEB 0x1111 - #define DFMT_PC 0x4441 - #define DFMT_APPLE 0x1111 - #define DFMT_APPLE_INTEL 0x4441 -@@ -75,6 +77,13 @@ - #define DFMT_IA64 0x4441 - #define DFMT_LINUX64 0x4441 - #define DFMT_POWERPC64 0x1111 -+#define DFMT_POWERPC64LE 0x4441 -+#define DFMT_ARMV4L 0x4441 -+#define DFMT_AARCH64 0x4441 -+#define DFMT_X86_64 0x4441 -+#define DFMT_SH 0x4441 -+#define DFMT_SHEB 0x1111 -+#define DFMT_RISCV64 0x4441 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -288,7 +297,7 @@ typedef int hdf_pint_t; - - #endif /* IBM6000 */ - --#if defined(HP9000) || (!defined(__convexc__) && (defined(hpux) || defined(__hpux))) -+#if defined(HP9000) || (!defined(__convexc__) && (defined(hpux) || defined(__hpux) || defined(__hppa__))) - - #ifndef HP9000 - #define HP9000 -@@ -347,6 +356,10 @@ typedef int hdf_pint_t; - /* what each does */ - #define JMEMSYS MEM_ANSI - -+#ifdef __linux__ -+#define FNAME_POST_UNDERSCORE -+#endif -+ - #endif /* HP9000 */ - - -@@ -670,6 +683,462 @@ typedef int hdf_pint_t; - #endif /* !(defined(__APPLE__)) */ - - /*-----------------------------------------------------*/ -+#if defined (__linux__) && defined (__mc68000__) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_MOTOROLA -+ -+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */ -+typedef void VOID; -+#endif /* end VOID */ -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef long int int32; -+typedef unsigned long int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef long intf; /* size of INTEGERs in Fortran compiler */ -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+ -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/m68k */ -+ -+#if defined (__linux__) && defined (__sparc__) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_SUN -+ -+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */ -+typedef void VOID; -+#endif /* end VOID */ -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+#ifdef _LP64 /* 64-bit environment */ -+typedef int int32; -+typedef unsigned int uint32; -+#else /* 32-bit environment */ -+typedef long int int32; -+typedef unsigned long int uint32; -+#endif -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef long intf; /* size of INTEGERs in Fortran compiler */ -+#ifdef _LP64 /* 64-bit environment */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#else /* 32-bit environment */ -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#endif -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+ -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/Sparc */ -+ -+#if defined (__linux__) && defined (__powerpc__) && !defined(__powerpc64__) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_MOTOROLA -+ -+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */ -+typedef void VOID; -+#endif /* end VOID */ -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef long int int32; -+typedef unsigned long int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef long intf; /* size of INTEGERs in Fortran compiler */ -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+ -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/powerpc */ -+ -+#if defined (__linux__) && defined (__s390__) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_S390 -+ -+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */ -+typedef void VOID; -+#endif /* end VOID */ -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+#ifdef _LP64 /* 64-bit environment */ -+typedef int int32; -+typedef unsigned int uint32; -+#else /* 32-bit environment */ -+typedef long int int32; -+typedef unsigned long int uint32; -+#endif -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef long intf; /* size of INTEGERs in Fortran compiler */ -+#ifdef _LP64 /* 64-bit environment */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#else /* 32-bit environment */ -+typedef int hdf_pint_t; /* an integer the same size as a pointer */ -+#endif -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+ -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/s390 */ -+ -+#if defined (__linux__) && (defined (__MIPSEB__) || defined(__MIPSEL__)) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#if defined (__MIPSEB__) -+#define DF_MT DFMT_MIPSEB -+#elif defined(__MIPSEL__) -+#define DF_MT DFMT_MIPSEL -+#endif -+ -+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */ -+typedef void VOID; -+#endif /* end VOID */ -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef long intf; /* size of INTEGERs in Fortran compiler */ -+typedef long int hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+ -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/mips */ -+ -+#if defined (__linux__) && defined (__arm__) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_ARMV4L -+ -+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */ -+typedef void VOID; -+#endif /* end VOID */ -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef long intf; /* size of INTEGERs in Fortran compiler */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+ -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/arm */ -+ -+#if defined (__linux__) && defined (__aarch64__) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_AARCH64 -+ -+typedef void VOID; -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#define FILELIB UNIXBUFIO -+ -+#ifndef BIG_LONGS -+#define BIG_LONGS -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/aarch64 */ -+ -+#if defined (__linux__) && defined (__riscv) && (__riscv_xlen == 64) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#define DF_MT DFMT_RISCV64 -+ -+typedef void VOID; -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#define FILELIB UNIXBUFIO -+ -+#ifndef BIG_LONGS -+#define BIG_LONGS -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/riscv64 */ -+ - #if defined(NEXT) || defined(NeXT) - - #ifndef NEXT -@@ -932,7 +1401,11 @@ Please check your Makefile. - - #include /* for unbuffered i/o stuff */ - #include --#define DF_MT DFMT_POWERPC64 -+#ifdef __LITTLE_ENDIAN__ -+#define DF_MT DFMT_POWERPC64LE -+#else -+#define DF_MT DFMT_POWERPC64 -+#endif - typedef void VOID; - typedef void *VOIDP; - typedef char *_fcd; -@@ -956,6 +1429,11 @@ typedef long hdf_pint_t; - #define _fcdtocp(desc) (desc) - #define FILELIB UNIXBUFIO - -+#ifndef BIG_LONGS -+#define BIG_LONGS -+#endif -+ -+ - /* JPEG #define's - Look in the JPEG docs before changing - (Q) */ - - /* Determine the memory manager we are going to use. Valid values are: */ -@@ -1101,6 +1579,8 @@ typedef long hdf_pint_t; - #define _fcdtocp(desc) (desc) - #define FILELIB UNIXBUFIO - -+#define BIG_LONGS -+ - /* JPEG #define's - Look in the JPEG docs before changing - (Q) */ - - /* Determine the memory manager we are going to use. Valid values are: */ -@@ -1115,6 +1595,66 @@ typedef long hdf_pint_t; - - #endif /* IA64 */ - -+/* Renesas SuperH SH3(little/big)/SH4(little/big) */ -+#if defined (__linux__) && defined(__sh__) -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE 1 -+ -+#include -+#include /* for unbuffered file I/O */ -+#include -+#include -+#include /* for character macros */ -+ -+#if defined (__LITTLE_ENDIAN__) -+#define DF_MT DFMT_SH -+#elif defined(__BIG_ENDIAN__) -+#define DF_MT DFMT_SHEB -+#endif -+ -+#ifndef VOID /* The stupid windows.h header file uses a #define instead of a typedef */ -+typedef void VOID; -+#endif /* end VOID */ -+ -+typedef void * VOIDP; -+typedef char * _fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef signed char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef long int int32; -+typedef unsigned long int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef float float32; -+typedef double float64; -+typedef long intf; -+typedef int hdf_pint_t; -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+ -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+ -+#endif /* Linux/sh */ -+ - #ifndef GOT_MACHINE - No machine type has been defined. Your Makefile needs to have someing like - -DSUN or -DUNICOS in order for the HDF internal structures to be defined ---- a/hdf/src/hconv.h -+++ b/hdf/src/hconv.h -@@ -59,7 +59,7 @@ - /* CONSTANT DEFINITIONS */ - /*****************************************************************************/ - /* Generally Big-Endian machines */ --#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) -+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !(defined(__powerpc__) && defined(__LITTLE_ENDIAN__)) && !defined(__aarch64__) && !defined(__ARM_EABI__) && !defined(__riscv) - # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ - # define UI8_OUT DFKnb1b - # define SI16_IN DFKnb2b /* S = Signed */ diff --git a/gnu/packages/patches/hdf4-tirpc.patch b/gnu/packages/patches/hdf4-tirpc.patch deleted file mode 100644 index 3f436e3887..0000000000 --- a/gnu/packages/patches/hdf4-tirpc.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 base-commit: 4c7627dfec88350f9a1705e9527c38dd41506f8b -- 2.41.0