Hi, On Thu, 6 Feb 2020 21:45:47 +0100 Rafael Sadowski wrote:
> Hi ports@, > > Ninja 0.10.0 was released a while ago. Here is a link to the notes: > > https://groups.google.com/forum/#!msg/ninja-build/piOltAhywFA/zPfkrTtRCwAJ > > The new version comes with Fortran support. Maybe we can finally get > rid of all the "USE_NINJA=No". This is a job for someone who's > interested. Volunteers come forward :) > > This diff needs a hand full of OKs from persons in charge of the > bulks. Ninja is built with ports-gcc on base-gcc archs, but i've found that the environment is not passed in the "do-test" hook, so tests are built with base-gcc, and fail with: cc1plus: error: unrecognized command line option "-fdiagnostics-color" I've tweaked your Makefile diff to pass the test environment. On powerpc, it builds and tests are passing [0]. I can't test bulk on macppc within a reasonable timeframe, but i'll fix stuff with it, so i'll report back if any issue arise. Charlène. [0] https://bin.charlenew.xyz/ninja.powerpc.log Index: Makefile =================================================================== RCS file: /cvs/ports/devel/ninja/Makefile,v retrieving revision 1.29 diff -u -p -u -p -r1.29 Makefile --- Makefile 20 Dec 2019 15:51:26 -0000 1.29 +++ Makefile 7 Feb 2020 21:02:03 -0000 @@ -9,10 +9,10 @@ COMMENT = small build system with a foc GH_ACCOUNT = ninja-build GH_PROJECT = ninja -GH_TAGNAME = v1.9.0 -REVISION = 0 +GH_TAGNAME = v1.10.0 CATEGORIES = devel + HOMEPAGE = https://ninja-build.org/ # Apache License v2.0 @@ -56,7 +56,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion ${PREFIX}/share/ninja do-test: - @cd ${WRKSRC} && ./ninja ninja_test \ + @cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ./ninja ninja_test \ && ./ninja_test --gtest_filter=MyTest.Name .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/ninja/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo 22 Jun 2019 20:23:04 -0000 1.11 +++ distinfo 7 Feb 2020 21:02:03 -0000 @@ -1,2 +1,2 @@ -SHA256 (ninja-1.9.0.tar.gz) = XX7HWCj40/0aDC8xtbDOp4DN/hAxNZIoxCjBpIv81bk= -SIZE (ninja-1.9.0.tar.gz) = 190860 +SHA256 (ninja-1.10.0.tar.gz) = OBAxiwhIlDX478GcBVJegKmTr1pVuqDf6uBGWp1F+Z8= +SIZE (ninja-1.10.0.tar.gz) = 210313 Index: patches/patch-src_build_cc =================================================================== RCS file: /cvs/ports/devel/ninja/patches/patch-src_build_cc,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_build_cc --- patches/patch-src_build_cc 20 Dec 2019 15:51:26 -0000 1.1 +++ patches/patch-src_build_cc 7 Feb 2020 21:02:03 -0000 @@ -6,7 +6,7 @@ by using a set of pointers. Index: src/build.cc --- src/build.cc.orig +++ src/build.cc -@@ -348,9 +348,8 @@ bool Plan::AddSubTarget(Node* node, Node* dependent, s +@@ -382,9 +382,8 @@ void Plan::EdgeWanted(const Edge* edge) { Edge* Plan::FindWork() { if (ready_.empty()) return NULL; @@ -18,7 +18,7 @@ Index: src/build.cc return edge; } -@@ -372,7 +371,7 @@ void Plan::ScheduleWork(map<Edge*, Want>::iterator wan +@@ -406,7 +405,7 @@ void Plan::ScheduleWork(map<Edge*, Want>::iterator wan pool->RetrieveReadyEdges(&ready_); } else { pool->EdgeScheduled(*edge); Index: patches/patch-src_build_h =================================================================== RCS file: /cvs/ports/devel/ninja/patches/patch-src_build_h,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_build_h --- patches/patch-src_build_h 20 Dec 2019 15:51:26 -0000 1.1 +++ patches/patch-src_build_h 7 Feb 2020 21:02:03 -0000 @@ -6,12 +6,12 @@ by using a set of pointers. Index: src/build.h --- src/build.h.orig +++ src/build.h -@@ -103,7 +103,7 @@ struct Plan { (private) +@@ -122,7 +122,7 @@ struct Plan { (private) /// we want for the edge. map<Edge*, Want> want_; - set<Edge*> ready_; + deque<Edge*> ready_; - /// Total number of edges that have commands (not phony). - int command_edges_; + Builder* builder_; +