missing meson dependency on generated oids header
This is only failing for me in a reproducible mass build environment (poudriere) but not straight on my normal dev box:
[138/289] /usr/local/llvm10/bin/clang -Iui/d3ef7de@@gcr-ui-3@sha -Iui -I../ui -I. -I.. -Igck -Igcr …
In file included from ../ui/gcr-certificate-request-renderer.c:20:
./gcr/gcr-oids.h:5:2: error: unterminated conditional directive
#ifndef GCR_OIDS_
^
1 error generated.
because that file will only be generated later:
[153/289] /bin/sh /wrkdirs/usr/ports/security/gcr/work/gcr-3.36.0/gcr/gcr-mkoids -p GCR -c gcr/gcr-oids.c -h gcr/gcr-oids.h ../gcr/gcr-oids.list
hmm why would that be?
build ui/d3ef7de@@gcr-ui-3@sha/gcr-certificate-request-renderer.c.o: c_COMPILER ../ui/gcr-certificate-request-renderer.c || ui/gcr-enum-types.h gcr/gcr-oids.h gck/gck-enum-types.h gcr/gcr-enum-types-base.h
DEPFILE = ui/d3ef7de@@gcr-ui-3@sha/gcr-certificate-request-renderer.c.o.d
ARGS = -Iui/d3ef7de@@gcr-ui-3@sha -Iui -I../ui -I. -I.. -Igcr -Igck -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include -I/usr/local/lib/libffi-3.2.1/include -I/usr/local/include/gio-unix-2.0 -I/usr/local/include/p11-kit-1 -I/usr/local/include/gtk-3.0 -I/usr/local/include/pango-1.0 -I/usr/local/include/harfbuzz -I/usr/local/include/freetype2 -I/usr/local/include/fribidi -I/usr/local/include/cairo -I/usr/local/include/pixman-1 -I/usr/local/include/libdrm -I/usr/local/include/libpng16 -I/usr/local/include/gdk-pixbuf-2.0 -I/usr/local/include/libepoll-shim -I/usr/local/include/atk-1.0 -I/usr/local/include/at-spi2-atk/2.0 -I/usr/local/include/dbus-1.0 -I/usr/local/lib/dbus-1.0/include -I/usr/local/include/at-spi-2.0 -Xclang -fcolor-diagnostics -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O3 -O2 -march=haswell -fstack-protector-strong -fPIE -fPIC -fno-strict-aliasing -fPIC -pthread -D_THREAD_SAFE '-DG_LOG_DOMAIN="Gcr"' -DGCR_COMPILATION -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE -DP11_KIT_API_SUBJECT_TO_CHANGE
Well that file doesn't depend on gcr-oids.h
..
I guess this could be plumbed through gcr_base_dep
somehow, but this easy fix does it for me:
--- ui/meson.build.orig 2020-06-18 19:14:51 UTC
+++ ui/meson.build
@@ -75,6 +75,7 @@ gcr_ui_sources = [
gcr_ui_private_sources,
gcr_ui_public_sources,
gcr_ui_enums_gen,
+ gcr_oids,
]
gcr_ui_deps = [