On Sat, 29 Jun 2013, Stuart Henderson wrote: > This fails intermittently - marking it as USE_NINJA=No for now, most > likely a dependency ordering problem. Logs attached.
> [86/190] /usr/obj/ports/xtrkcad-4.2.0b1/bin/cc -DXTRKCAD_CMAKE_BUILD > -I/usr/local/include > -I/usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin -Iapp/bin -I. > -Iapp/help > -I/usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/wlib/include > -DMKTURNOUT -MMD -MT app/bin/CMakeFiles/mkturnout.dir/utility.c.o -MF > "app/bin/CMakeFiles/mkturnout.dir/utility.c.o.d" -o > app/bin/CMakeFiles/mkturnout.dir/utility.c.o -c > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/utility.c > [87/190] /usr/obj/ports/xtrkcad-4.2.0b1/bin/cc -DXTRKCAD_CMAKE_BUILD > -I/usr/local/include > -I/usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin -Iapp/bin -I. > -Iapp/help > -I/usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/wlib/include > -DMKTURNOUT -MMD -MT app/bin/CMakeFiles/mkturnout.dir/ctodesgn.c.o -MF > "app/bin/CMakeFiles/mkturnout.dir/ctodesgn.c.o.d" -o > app/bin/CMakeFiles/mkturnout.dir/ctodesgn.c.o -c > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c > FAILED: /usr/obj/ports/xtrkcad-4.2.0b1/bin/cc -DXTRKCAD_CMAKE_BUILD > -I/usr/local/include > -I/usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin -Iapp/bin -I. > -Iapp/help > -I/usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/wlib/include > -DMKTURNOUT -MMD -MT app/bin/CMakeFiles/mkturnout.dir/ctodesgn.c.o -MF > "app/bin/CMakeFiles/mkturnout.dir/ctodesgn.c.o.d" -o > app/bin/CMakeFiles/mkturnout.dir/ctodesgn.c.o -c > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c > In file included from > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/track.h:34, > from > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:31: > /usr/include/malloc.h:4:2: warning: #warning "<malloc.h> is obsolete, use > <stdlib.h>" > In file included from > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/track.h:41, > from > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:31: > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/draw.h:27:22: > error: messages.h: No such file or directory > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c: In > function 'ComputeCurve': > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:1040: > error: 'MSG_TODSGN_NO_CONVERGE' undeclared (first use in this function) > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:1040: > error: (Each undeclared identifier is reported only once > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:1040: > error: for each function it appears in.) > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c: In > function 'LoadSegs': > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:1090: > error: 'MSG_TODSGN_VALUES_GTR_0' undeclared (first use in this function) > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:1203: > error: 'MSG_TODSGN_CROSSOVER_TOO_SHORT' undeclared (first use in this > function) > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c: In > function 'NewTurnOk': > /usr/obj/ports/xtrkcad-4.2.0b1/xtrkcad-4.2.0-beta1/app/bin/ctodesgn.c:1505: > error: 'MSG_TODSGN_DESC_NONBLANK' undeclared (first use in this function) > ninja: build stopped: subcommand failed. This is because: mkturnout <- ctodesgn.c <- track.h <- draw.h <- messages.h The following diff should fix it. Cheers, David Index: Makefile =================================================================== RCS file: /cvs/ports/cad/xtrkcad/Makefile,v retrieving revision 1.10 diff -u -p -u -p -r1.10 Makefile --- Makefile 29 Jun 2013 10:37:35 -0000 1.10 +++ Makefile 30 Jun 2013 13:13:21 -0000 @@ -11,9 +11,6 @@ HOMEPAGE= http://www.xtrkcad.org/ MAINTAINER= Sebastian Reitenbach <[email protected]> -# intermittent failures -USE_NINJA= No - # GPLv2 PERMIT_PACKAGE_CDROM= Yes Index: patches/patch-app_bin_CMakeLists_txt =================================================================== RCS file: patches/patch-app_bin_CMakeLists_txt diff -N patches/patch-app_bin_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-app_bin_CMakeLists_txt 30 Jun 2013 13:13:21 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- app/bin/CMakeLists.txt.orig Fri Sep 16 04:32:31 2011 ++++ app/bin/CMakeLists.txt Sun Jun 30 15:00:57 2013 +@@ -154,6 +154,10 @@ ADD_EXECUTABLE(mkturnout + ctodesgn.c + utility.c + ) ++ ++# This ensures that messages.h has been generated before we build mkturnout ++ADD_DEPENDENCIES(mkturnout Help) ++ + SET_TARGET_PROPERTIES(mkturnout PROPERTIES COMPILE_FLAGS -DMKTURNOUT) + IF(NOT WIN32) + TARGET_LINK_LIBRARIES(mkturnout m)
