Skip to content

Comments

doc: Redefine r.mapcalc build deps for color table thumbnails#5098

Merged
wenzeslaus merged 2 commits intoOSGeo:mainfrom
wenzeslaus:shuffle-r_mapcalc
Feb 13, 2025
Merged

doc: Redefine r.mapcalc build deps for color table thumbnails#5098
wenzeslaus merged 2 commits intoOSGeo:mainfrom
wenzeslaus:shuffle-r_mapcalc

Conversation

@wenzeslaus
Copy link
Member

@wenzeslaus wenzeslaus commented Feb 12, 2025

The original dependency handling between r.color and r.mapcalc from fd7d0ec and 9e56f6c uses dependency on binaries and builds r.mapcalc ahead of time. The new build code explicitly declares the dependency between r.color and r.mapcalc subdir phony targets.

This works for me locally with (-j1, -j2, -j4, -j10, -j30):

make distclean -j30 && ./configure.sh && make -j30

This fixes the new issue which arose in #5048 with the Markdown documentation where r.colors build failed because r.mapcalc gave permission denied. I temporarily fixed the issue in #5048 by removing r.mapcalc from SUBDIRS. However, the change broke the recompilation with distclean not tested in CI). The new approach with explicit subdir phony target dependency avoids both issues.

The original dependency handling between r.color and r.mapcalc from fd7d0ec and 9e56f6c uses dependency on binaries and builds r.mapcalc ahead of time. The new build code defines dependency between r.color and r.mapcalc subdir phony targets.
@wenzeslaus wenzeslaus added bug Something isn't working docs labels Feb 12, 2025
@wenzeslaus
Copy link
Member Author

@tmszi Does this fix also #3038 by any chance?

@github-actions github-actions bot added raster Related to raster data processing module labels Feb 12, 2025
@wenzeslaus wenzeslaus enabled auto-merge (squash) February 12, 2025 21:07
Copy link
Contributor

@petrasovaa petrasovaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's give this a try (depending on the CI results)

@nilason
Copy link
Contributor

nilason commented Feb 12, 2025

See also #3038.

@wenzeslaus
Copy link
Member Author

See also #3038.

I see the images and I didn't notice the issue lately, but I asked @tmszi above for feedback on that. Anyway, this PR does not aim at that, so I'm planning to merge it whether it makes a difference or not.

@wenzeslaus
Copy link
Member Author

The CI looks good but needs update to #5102 for stability.

@wenzeslaus wenzeslaus changed the title doc: Redefine r.mapcalc build dependencies for color table thumbnails doc: Redefine r.mapcalc build deps for color table thumbnails Feb 12, 2025
@wenzeslaus wenzeslaus merged commit c1849f5 into OSGeo:main Feb 13, 2025
26 checks passed
@wenzeslaus wenzeslaus deleted the shuffle-r_mapcalc branch February 13, 2025 05:01
@github-actions github-actions bot added this to the 8.5.0 milestone Feb 13, 2025
@tmszi
Copy link
Member

tmszi commented Feb 13, 2025

@tmszi Does this fix also #3038 by any chance?

Yes it does.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working docs module raster Related to raster data processing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants