From d25bd4623f43a63534d308eaca51f97043eab172 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 2 Mar 2020 17:23:52 +0100 Subject: [PATCH] doxygen: fix parallel build failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fix build race condition - fixed SRCURL with parallel build ( -j16 ) this happened: ``` In file included from /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/src/vhdljjparser.h:23:0, from /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/vhdlparser/VhdlParser.h:8, from /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/vhdlparser/VhdlParser.cc:2: /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/vhdlparser/VhdlParser.cc: In member function ‘QCString vhdl::parser::VhdlParser::library_clause()’: /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/src/config.h:35:32: error: ‘ConfigValues’ has not been declared #define Config_getBool(val) (ConfigValues::instance().val) ^ /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/vhdlparser/VhdlParser.cc:5720:22: note: in expansion of macro ‘Config_getBool’ if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) ^~~~~~~~~~~~~~ /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/vhdlparser/VhdlParser.cc: In member function ‘QCString vhdl::parser::VhdlParser::use_clause()’: /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/src/config.h:35:32: error: ‘ConfigValues’ has not been declared #define Config_getBool(val) (ConfigValues::instance().val) ^ /dev/shm/mxqd/mnt/job/19694203/doxygen-1.8.17-0/buildroot/doxygen/doxygen-1.8.17-0/source/vhdlparser/VhdlParser.cc:10420:43: note: in expansion of macro ‘Config_getBool’ if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) ^~~~~~~~~~~~~~ make[2]: *** [vhdlparser/CMakeFiles/vhdlparser.dir/build.make:118: vhdlparser/CMakeFiles/vhdlparser.dir/VhdlParser.cc.o] Error 1 ``` --- doxygen.be0 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doxygen.be0 b/doxygen.be0 index 05512a0ba..f5a538804 100755 --- a/doxygen.be0 +++ b/doxygen.be0 @@ -1,10 +1,11 @@ #!/usr/bin/env beesh -# BEE_VERSION doxygen-1.8.17-0 +# BEE_VERSION doxygen-1.8.17-1 # more info: http://www.doxygen.nl/index.html -SRCURL[0]="http://doxygen.nl/files/doxygen-${PKGVERSION}.src.tar.gz" +#SRCURL[0]="http://doxygen.nl/files/doxygen-${PKGVERSION}.src.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/7997a15c73a8bd6d003eaba5c2ee2b47/doxygen-1.8.17.src.tar.gz" # PATCHURL+=() @@ -24,9 +25,9 @@ SRCURL[0]="http://doxygen.nl/files/doxygen-${PKGVERSION}.src.tar.gz" # bee_configure #} -#mee_build() { -# bee_build -#} +mee_build() { + bee_build -j1 +} #mee_install() { # bee_install