diff options
-rw-r--r-- | meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch | 6 | ||||
-rw-r--r-- | meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb (renamed from meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb) | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch index 642d7d1662..a8050cc55b 100644 --- a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch | |||
@@ -15,7 +15,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
15 | 15 | ||
16 | --- a/config/cmake/libh5cc.in | 16 | --- a/config/cmake/libh5cc.in |
17 | +++ b/config/cmake/libh5cc.in | 17 | +++ b/config/cmake/libh5cc.in |
18 | @@ -45,7 +45,7 @@ for arg in $@ ; do | 18 | @@ -44,7 +44,7 @@ for arg in $@ ; do |
19 | exit $status | 19 | exit $status |
20 | ;; | 20 | ;; |
21 | *) | 21 | *) |
@@ -45,8 +45,8 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
45 | H5_CPPFLAGS: @H5_CPPFLAGS@ | 45 | H5_CPPFLAGS: @H5_CPPFLAGS@ |
46 | AM_CPPFLAGS: @AM_CPPFLAGS@ | 46 | AM_CPPFLAGS: @AM_CPPFLAGS@ |
47 | CFLAGS: @CMAKE_C_FLAGS@ | 47 | CFLAGS: @CMAKE_C_FLAGS@ |
48 | @@ -52,8 +52,8 @@ Languages: | 48 | @@ -53,8 +53,8 @@ Languages: |
49 | @BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @H5_ENABLE_STATIC_LIB@ | 49 | @BUILD_FORTRAN_CONDITIONAL_TRUE@ Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ |
50 | 50 | ||
51 | C++: @HDF5_BUILD_CPP_LIB@ | 51 | C++: @HDF5_BUILD_CPP_LIB@ |
52 | -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ | 52 | -@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ |
diff --git a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch index de052451bd..f0eb05a1e7 100644 --- a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch +++ b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch | |||
@@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
12 | 12 | ||
13 | --- a/CMakeLists.txt | 13 | --- a/CMakeLists.txt |
14 | +++ b/CMakeLists.txt | 14 | +++ b/CMakeLists.txt |
15 | @@ -196,19 +196,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF | 15 | @@ -191,19 +191,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF |
16 | set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") | 16 | set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") |
17 | set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") | 17 | set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") |
18 | set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") | 18 | set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") |
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb index 80611c6714..4feec61afd 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.13.2.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.0.bb | |||
@@ -12,11 +12,11 @@ inherit cmake siteinfo qemu | |||
12 | DEPENDS += "qemu-native" | 12 | DEPENDS += "qemu-native" |
13 | 13 | ||
14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
15 | https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.13/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ | 15 | https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ |
16 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ | 16 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ |
17 | file://0001-cmake-remove-build-flags.patch \ | 17 | file://0001-cmake-remove-build-flags.patch \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "9c51b3da426977ec622a43dca8adaf4e81eabf838c1ff80c6225ad1d3ed54b5c" | 19 | SRC_URI[sha256sum] = "e4e79433450edae2865a4c6328188bb45391b29d74f8c538ee699f0b116c2ba0" |
20 | 20 | ||
21 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" | 21 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" |
22 | 22 | ||