1 files changed, 24 insertions, 31 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 288e642fc7..b896770d91 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
@@ -13,53 +13,46 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 config/cmake/libhdf5.settings.cmake.in | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
-diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in
-index f462d56..93c7137 100644
 --- a/config/cmake/libh5cc.in
 +++ b/config/cmake/libh5cc.in
-@@ -29,4 +29,4 @@ printf 'dir is %s\n' "$dir"
+@@ -45,7 +45,7 @@ for arg in $@ ; do
- 
+       exit $status
- export PKG_CONFIG_PATH=$dir/lib/pkgconfig
+       ;;
- 
+     *)
-@_PKG_CONFIG_COMPILER@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@
+-      @_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@`
-+`pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@
+      `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@
-diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
+       status=$?
-index c337dea..0ab9066 100644
+       exit $status
+       ;;
 --- a/config/cmake/libhdf5.settings.cmake.in
 +++ b/config/cmake/libhdf5.settings.cmake.in
-@@ -16,8 +16,8 @@ General Information:
+@@ -27,14 +27,14 @@ Linking Options:
- Compiling Options:
+                      H5_LDFLAGS: @H5_LDFLAGS@
- ------------------
-                Compilation Mode: @CMAKE_BUILD_TYPE@ @CMAKE_C_COMPILER_VERSION@
-                     C Compiler: @CMAKE_C_COMPILER@
-                         CFLAGS: @CMAKE_C_FLAGS@
-+                     C Compiler:
-+                         CFLAGS:
-                       H5_CFLAGS: @H5_CFLAGS@
-                       AM_CFLAGS: @AM_CFLAGS@
-                        CPPFLAGS: @CPPFLAGS@
-@@ -29,8 +29,8 @@ Compiling Options:
-                         LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@
                      AM_LDFLAGS: @AM_LDFLAGS@
                 Extra libraries: @LINK_LIBS@
 -                       Archiver: @CMAKE_AR@
 -                         Ranlib: @CMAKE_RANLIB@
 +                       Archiver:
 +                         Ranlib:
-               Debugged Packages: @DEBUG_PKG@
-                     API Tracing: @HDF5_ENABLE_TRACE@
 
-@@ -46,8 +46,8 @@ Languages:
+ Languages:
- @BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: YES
+ ----------
+                               C: YES
+-                     C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@
+-                       CPPFLAGS: @CPPFLAGS@
+                     C Compiler:
+                       CPPFLAGS:
+                     H5_CPPFLAGS: @H5_CPPFLAGS@
+                     AM_CPPFLAGS: @AM_CPPFLAGS@
+                          CFLAGS: @CMAKE_C_FLAGS@
+@@ -52,8 +52,8 @@ Languages:
+ @BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
 
                             C++: @HDF5_BUILD_CPP_LIB@
 -@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
 -@BUILD_CXX_CONDITIONAL_TRUE@                      C++ Flags: @CMAKE_CXX_FLAGS@
 +@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler:
 +@BUILD_CXX_CONDITIONAL_TRUE@                      C++ Flags:
- @BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @H5_CXXFLAGS@
+ @BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
 @BUILD_CXX_CONDITIONAL_TRUE@                   AM C++ Flags: @AM_CXXFLAGS@
 @BUILD_CXX_CONDITIONAL_TRUE@             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
-- 
-2.17.1

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 288e642fc7..b896770d91 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
@@ -13,53 +13,46 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13	config/cmake/libhdf5.settings.cmake.in \| 12 ++++++------	13	config/cmake/libhdf5.settings.cmake.in \| 12 ++++++------
14	2 files changed, 7 insertions(+), 7 deletions(-)	14	2 files changed, 7 insertions(+), 7 deletions(-)
15		15
16	diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in
17	index f462d56..93c7137 100644
18	--- a/config/cmake/libh5cc.in	16	--- a/config/cmake/libh5cc.in
19	+++ b/config/cmake/libh5cc.in	17	+++ b/config/cmake/libh5cc.in
20	@@ -29,4 +29,4 @@ printf 'dir is %s\n' "$dir"	18	@@ -45,7 +45,7 @@ for arg in $@ ; do
21		19	exit $status
22	export PKG_CONFIG_PATH=$dir/lib/pkgconfig	20	;;
23		21	*)
24	-@_PKG_CONFIG_COMPILER@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@	22	- @_PKG_CONFIG_COMPILER@ $@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@`
25	+`pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@	23	+ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@
26	diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in	24	status=$?
27	index c337dea..0ab9066 100644	25	exit $status
		26	;;
28	--- a/config/cmake/libhdf5.settings.cmake.in	27	--- a/config/cmake/libhdf5.settings.cmake.in
29	+++ b/config/cmake/libhdf5.settings.cmake.in	28	+++ b/config/cmake/libhdf5.settings.cmake.in
30	@@ -16,8 +16,8 @@ General Information:	29	@@ -27,14 +27,14 @@ Linking Options:
31	Compiling Options:	30	H5_LDFLAGS: @H5_LDFLAGS@
32	------------------
33	Compilation Mode: @CMAKE_BUILD_TYPE@ @CMAKE_C_COMPILER_VERSION@
34	- C Compiler: @CMAKE_C_COMPILER@
35	- CFLAGS: @CMAKE_C_FLAGS@
36	+ C Compiler:
37	+ CFLAGS:
38	H5_CFLAGS: @H5_CFLAGS@
39	AM_CFLAGS: @AM_CFLAGS@
40	CPPFLAGS: @CPPFLAGS@
41	@@ -29,8 +29,8 @@ Compiling Options:
42	LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@
43	AM_LDFLAGS: @AM_LDFLAGS@	31	AM_LDFLAGS: @AM_LDFLAGS@
44	Extra libraries: @LINK_LIBS@	32	Extra libraries: @LINK_LIBS@
45	- Archiver: @CMAKE_AR@	33	- Archiver: @CMAKE_AR@
46	- Ranlib: @CMAKE_RANLIB@	34	- Ranlib: @CMAKE_RANLIB@
47	+ Archiver:	35	+ Archiver:
48	+ Ranlib:	36	+ Ranlib:
49	Debugged Packages: @DEBUG_PKG@
50	API Tracing: @HDF5_ENABLE_TRACE@
51		37
52	@@ -46,8 +46,8 @@ Languages:	38	Languages:
53	@BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: YES	39	----------
		40	C: YES
		41	- C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@
		42	- CPPFLAGS: @CPPFLAGS@
		43	+ C Compiler:
		44	+ CPPFLAGS:
		45	H5_CPPFLAGS: @H5_CPPFLAGS@
		46	AM_CPPFLAGS: @AM_CPPFLAGS@
		47	CFLAGS: @CMAKE_C_FLAGS@
		48	@@ -52,8 +52,8 @@ Languages:
		49	@BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: @H5_ENABLE_STATIC_LIB@
54		50
55	C++: @HDF5_BUILD_CPP_LIB@	51	C++: @HDF5_BUILD_CPP_LIB@
56	-@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@
57	-@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@	53	-@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@
58	+@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler:	54	+@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler:
59	+@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags:	55	+@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags:
60	@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@	56	@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
61	@BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@	57	@BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@
62	@BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@	58	@BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@
63	--
64	2.17.1
65