Skip to content

Commit

Permalink
build-aux/sodepends.py: Fix broken build when manpage changes.
Browse files Browse the repository at this point in the history
Commit [0] updated ovn-detrace.1.in, which triggered an existing problem
of the build system. After this change, for any existed build
environments that have created a separate build dir (instead of directly
build under the root dir of the source code), the build is broken, and
complains:

utilities/ovn-detrace.1.in not found in: . srcdir OVS_MANDIR .
make: *** [Makefile:3482: ../manpages.mk] Error 1

The root cause is that an earlier commit b6a7501 had a bug and the
sodepends script didn't read the new -I input properly.

[0] 25b4d76 ("ovn-detrace: Support connecting to NB and SB raft followers")

Fixes: b6a7501 ("manpages.mk: fix dependencies path")
Signed-off-by: Han Zhou <hzhou@ovn.org>
Acked-by: Mark Michelson <mmichels@redhat.com>
(cherry picked from commit f418dce)
  • Loading branch information
hzhou8 committed Jan 12, 2023
1 parent 734c6ac commit a3388a2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build-aux/sodepends.py
Expand Up @@ -63,7 +63,7 @@ def sodepends(include_info, filenames, dst):
continue

# Open file.
include_dirs = [info[0] for info in include_info]
include_dirs = [info[1] if len(info) == 2 else info[0] for info in include_info]
fn = soutil.find_file(include_dirs, toplevel)
if not fn:
ok = False
Expand Down

0 comments on commit a3388a2

Please sign in to comment.