CXX-2749 Fix debian-package-build-mnmlstc #1036
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kevinAlbs
approved these changes
Oct 9, 2023
| # Drop MNMLSTC headers in a location where dh_install will pick them up | ||
| mv $(CURDIR)/debian/tmp-mnmlstc/usr/include/bsoncxx/v_noabi/bsoncxx/third_party \ | ||
| $(CURDIR)/debian/tmp/usr/include/bsoncxx/v_noabi/bsoncxx/ | ||
| rm -rf $(CURDIR)/debian/tmp-mnmlstc |
There was a problem hiding this comment.
Also remove DESTDIR=$(CURDIR)/debian/tmp-mnmlstc in override_dh_auto_build since MNMLSTIC is no longer installed during build step?
There was a problem hiding this comment.
Ooh, I missed that. I agree that it should be removed.
There was a problem hiding this comment.
Verified by this patch.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to CXX-2749. Followup to #1019 and #1024. Verified by this patch.
Applies changes made in prior PRs to install rules and include paths for mnmlstc/core to the Debian packaging rules (removal of custom header file installation/management, addition of mnmlstc directory to include directories). Additionally, default Debian packaging commands disable downloads via
FETCHCONTENT_FULLY_DISCONNECTED=ON. Disabling this to allow downloads during package build is considered acceptable, as the mnmlstc polyfill package configuration is not the officially supported package configuration that is maintained and distributed on Debian (+ the prior method via ExternalProject was doing it anyways).