Merge hdf4: modernize, fix cross (#348334)

This commit is contained in:
Jan Tojnar 2024-11-06 00:38:19 +01:00 committed by GitHub
commit cf8ec6821c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,99 +1,114 @@
{ lib {
, stdenv lib,
, fetchpatch stdenv,
, fetchurl fetchpatch,
, fixDarwinDylibNames fetchurl,
, cmake fixDarwinDylibNames,
, libjpeg cmake,
, uselibtirpc ? stdenv.hostPlatform.isLinux libjpeg,
, libtirpc uselibtirpc ? stdenv.hostPlatform.isLinux,
, zlib libtirpc,
, szipSupport ? false zlib,
, szip szipSupport ? false,
, javaSupport ? false szip,
, jdk javaSupport ? false,
, fortranSupport ? false jdk,
, gfortran fortranSupport ? false,
, netcdfSupport ? false gfortran,
netcdfSupport ? false,
}: }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "hdf"; pname = "hdf";
version = "4.2.15"; version = "4.2.15";
src = fetchurl { src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2";
sha256 = "04nbgfxyj5jg4d6sr28162cxbfwqgv0sa7vz1ayzvm8wbbpkbq5x"; hash = "sha256-veA171oc1f29Cn8fpcF+mLvVmTABiaxNI08W6bt7yxI=";
}; };
patches = [ patches = [
# Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly # Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch"; url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch";
sha256 = "0dbbfpsvvqzy9zyfv38gd81zzc44gxjib9sd8scxqnkkqprj6jq0"; hash = "sha256-AEsj88VzWtyZRk2nFWV/hLD/A2oPje38T/7jvfV1azU=";
}) })
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch"; url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch";
sha256 = "0ip4prcjpa404clm87ib7l71605mws54x9492n9pbz5yb51r9aqh"; hash = "sha256-EKuUQ1m+/HWTFYmkTormtQATDj0rHlQpI4CoK1m+5EY=";
}) })
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch"; url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch";
sha256 = "0aiqbr4s1l19y3r3y4wjd5fkv9cfc8rlr4apbh1p0d57wyvqa7i3"; hash = "sha256-Ix6Ft+enNHADXFeRTDNijqU9XWmSEz/y8CnQoEleOCo=";
}) })
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch"; url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch";
sha256 = "157k1avvkpf3x89m1fv4a1kgab6k3jv74rskazrmjivgzav4qaw3"; hash = "sha256-gytMtvpvR1nzV1NncrYc0yz1ZlBku1AT6sPdubcK85Q=";
}) })
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch"; url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";
sha256 = "112svcsilk16ybbsi8ywnxfl2p1v44zh3rfn4ijnl8z08vfqrvvs"; hash = "sha256-eu+M3UbgI2plJNblAT8hO1xBXbfco6jX8iZMGjXbWoQ=";
}) })
./darwin-aarch64.patch ./darwin-aarch64.patch
]; ];
nativeBuildInputs = [ nativeBuildInputs =
cmake [
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cmake
fixDarwinDylibNames ]
] ++ lib.optional fortranSupport gfortran; ++ lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
]
++ lib.optional fortranSupport gfortran;
buildInputs = [ buildInputs =
libjpeg [
zlib libjpeg
] zlib
++ lib.optional javaSupport jdk ]
++ lib.optional szipSupport szip ++ lib.optional javaSupport jdk
++ lib.optional uselibtirpc libtirpc; ++ lib.optional szipSupport szip
++ lib.optional uselibtirpc libtirpc;
preConfigure = lib.optionalString uselibtirpc '' preConfigure =
# Make tirpc discovery work with CMAKE_PREFIX_PATH lib.optionalString uselibtirpc ''
substituteInPlace config/cmake/FindXDR.cmake \ # Make tirpc discovery work with CMAKE_PREFIX_PATH
--replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ substituteInPlace config/cmake/FindXDR.cmake \
'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' --replace-fail 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \
'' + lib.optionalString szipSupport '' 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)'
export SZIP_INSTALL=${szip} ''
''; + lib.optionalString szipSupport ''
export SZIP_INSTALL=${szip}
'';
cmakeFlags = [ cmakeFlags =
"-DBUILD_SHARED_LIBS=ON" [
"-DHDF4_BUILD_TOOLS=ON" (lib.cmakeBool "BUILD_SHARED_LIBS" true)
"-DHDF4_BUILD_UTILS=ON" (lib.cmakeBool "HDF4_BUILD_TOOLS" true)
"-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" (lib.cmakeBool "HDF4_BUILD_UTILS" true)
"-DHDF4_ENABLE_JPEG_LIB_SUPPORT=ON" (lib.cmakeBool "HDF4_BUILD_WITH_INSTALL_NAME" false)
"-DHDF4_ENABLE_NETCDF=${if netcdfSupport then "ON" else "OFF"}" (lib.cmakeBool "HDF4_ENABLE_JPEG_LIB_SUPPORT" true)
"-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" (lib.cmakeBool "HDF4_ENABLE_Z_LIB_SUPPORT" true)
"-DJPEG_DIR=${libjpeg}" (lib.cmakeBool "HDF4_ENABLE_NETCD" netcdfSupport)
] ++ lib.optionals javaSupport [ (lib.cmakeBool "HDF4_BUILD_FORTRAN" fortranSupport)
"-DHDF4_BUILD_JAVA=ON" (lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport)
"-DJAVA_HOME=${jdk}" (lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport)
] ++ lib.optionals szipSupport [ (lib.cmakeBool "HDF4_BUILD_JAVA" javaSupport)
"-DHDF4_ENABLE_SZIP_ENCODING=ON" (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
"-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]
] ++ (if fortranSupport ++ lib.optionals javaSupport [
then [ (lib.cmakeFeature "JAVA_HOME" "${jdk}")
"-DHDF4_BUILD_FORTRAN=ON" ]
"-DCMAKE_Fortran_FLAGS=-fallow-argument-mismatch" ++ lib.optionals fortranSupport [
] (lib.cmakeFeature "CMAKE_Fortran_FLAGS" "-fallow-argument-mismatch")
else [ "-DHDF4_BUILD_FORTRAN=OFF" ] ]
); # using try_run would set these, but that requires a cross-compiling emulator to be available
# instead, we mark them as if the try_run calls returned a non-zero exit code
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
(lib.cmakeFeature "TEST_LFS_WORKS_RUN" "1")
(lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN" "1")
(lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT" "")
];
env = lib.optionalAttrs stdenv.cc.isClang { env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = toString [ NIX_CFLAGS_COMPILE = toString [
@ -102,7 +117,7 @@ stdenv.mkDerivation rec {
]; ];
}; };
doCheck = true; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [ excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [
"MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest"
@ -113,7 +128,9 @@ stdenv.mkDerivation rec {
checkPhase = checkPhase =
let let
excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; excludedTestsRegex = lib.optionalString (
finalAttrs.excludedTests != [ ]
) "(${lib.concatStringsSep "|" finalAttrs.excludedTests})";
in in
'' ''
runHook preCheck runHook preCheck
@ -121,7 +138,11 @@ stdenv.mkDerivation rec {
runHook postCheck runHook postCheck
''; '';
outputs = [ "bin" "dev" "out" ]; outputs = [
"bin"
"dev"
"out"
];
postInstall = '' postInstall = ''
moveToOutput bin "$bin" moveToOutput bin "$bin"
@ -145,4 +166,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.bsdOriginal; license = licenses.bsdOriginal;
}; };
} })