hdf4: 4.2.15 -> 4.2.16-2

The patches wouldn't apply anymore, but hopefully they're not needed.
This fixes build on {x86_64,aarch64}-linux
and doesn't break aarch64-darwin.
This commit is contained in:
Vladimír Čunát
2024-12-21 09:27:47 +01:00
parent 5d8de5b048
commit b658d41a22
2 changed files with 2 additions and 38 deletions
-11
View File
@@ -1,11 +0,0 @@
--- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200
+++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200
@@ -1343,7 +1343,7 @@
#endif /* IA64 */
/* Linux AArch64 */
-#if defined __aarch64__
+#if defined __aarch64__ && !defined __APPLE__
#ifdef GOT_MACHINE
If you get an error on this line more than one machine type has been defined.
+2 -27
View File
@@ -20,38 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hdf";
version = "4.2.15";
version = "4.2.16-2";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2";
hash = "sha256-veA171oc1f29Cn8fpcF+mLvVmTABiaxNI08W6bt7yxI=";
hash = "sha256-xcMjS1ASJYrvLkQy9kmzHCGyYBWvuhhXrYNkDD8raSw=";
};
patches = [
# Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch";
hash = "sha256-AEsj88VzWtyZRk2nFWV/hLD/A2oPje38T/7jvfV1azU=";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch";
hash = "sha256-EKuUQ1m+/HWTFYmkTormtQATDj0rHlQpI4CoK1m+5EY=";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch";
hash = "sha256-Ix6Ft+enNHADXFeRTDNijqU9XWmSEz/y8CnQoEleOCo=";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch";
hash = "sha256-gytMtvpvR1nzV1NncrYc0yz1ZlBku1AT6sPdubcK85Q=";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";
hash = "sha256-eu+M3UbgI2plJNblAT8hO1xBXbfco6jX8iZMGjXbWoQ=";
})
./darwin-aarch64.patch
];
nativeBuildInputs =
[
cmake