CVSROOT: /cvs
Module name: src
Changes by: flor...@cvs.openbsd.org 2019/03/01 01:02:25
Modified files:
sbin/unwind : Makefile captiveportal.c control.c frontend.c
resolver.c unwind.c
sbin/unwind/libunbound/sldns: Makefile.inc
sbin/unwind/libunbound/util: Makefile.inc
Added files:
sbin/unwind : log.c log.h parse.y
Removed files:
sbin/unwind : uw_log.c uw_log.h uw_parse.y
Log message:
Due to the way we build libunbound inside of unwind .o files collide in
the obj directory. Previously this was solved by keeping the libunbound
file name (to be able to keep in sync with upstream) and prefixing
the source filename of colliding .o files in unwind with uw_.
However, these files are shared through out our tree (namely parse.y,
log.c and log.h) and we try to keep them in sync.
Move files back to their original name and instead symlink colliding source
files in libunbound to unique filenames by prefixing them with the directory
they live in:
obj/sldns_parse.c -> /usr/src/sbin/unwind/libunbound/sldns/parse.c
obj/util_log.c -> /usr/src/sbin/unwind/libunbound/util/log.c
Idea to use symlinks deraadt@ via jsg@
OK benno
