| Patrick Williams | f52e3dd | 2024-01-26 13:04:43 -0600 | [diff] [blame] | 1 | It fails occasionally with missing generated header files: | 
|  | 2 |  | 
|  | 3 | | ../git/common/asn1.c:42:10: fatal error: openssl.asn.h: No such file or directory | 
|  | 4 | |    42 | #include "openssl.asn.h" | 
|  | 5 | |       |          ^~~~~~~~~~~~~~~ | 
|  | 6 | | compilation terminated. | 
|  | 7 |  | 
|  | 8 | According to meson manual page: | 
|  | 9 |  | 
|  | 10 | https://mesonbuild.com/Wrap-best-practices-and-tips.html#declare-generated-headers-explicitly | 
|  | 11 |  | 
|  | 12 | 'asn_h_dep' should be a dependency of static_library target 'libp11_asn1' to | 
|  | 13 | make sure that required header files generated before compile common/asn1.c. | 
|  | 14 |  | 
|  | 15 | Upstream-Status: Submitted [https://github.com/p11-glue/p11-kit/pull/619] | 
|  | 16 |  | 
|  | 17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 
|  | 18 | --- | 
|  | 19 | common/meson.build | 1 + | 
|  | 20 | 1 file changed, 1 insertion(+) | 
|  | 21 |  | 
|  | 22 | diff --git a/common/meson.build b/common/meson.build | 
|  | 23 | index dc86d7b..cc3ec48 100644 | 
|  | 24 | --- a/common/meson.build | 
|  | 25 | +++ b/common/meson.build | 
|  | 26 | @@ -113,6 +113,7 @@ if with_asn1 | 
|  | 27 | 'p11-asn1', libp11_asn1_sources, | 
|  | 28 | gnu_symbol_visibility: 'hidden', | 
|  | 29 | include_directories: configinc, | 
|  | 30 | +    dependencies: asn_h_dep, | 
|  | 31 | ) | 
|  | 32 |  | 
|  | 33 | libp11_asn1_dep = declare_dependency( |