Skip to content

Conversation

@Sacha0
Copy link
Member

@Sacha0 Sacha0 commented Mar 16, 2021

This commit reorders a couple touches in deps/pcre.mkl. Those touches are
intended to prevent patch application from triggering rebuild/reconf.
The present ordering doesn't quite succeed in that objective; patch
application triggers rebuild. On systems with compatible autotools,
the rebuild succeeds and the build is nonetheless happy. On systems
with incompatible versions of autotools, however, the build fails for
need of a reconf. The reordering in this commit prevents the rebuild.

Co-Authored-By: Rob Vermaas <[email protected]>

Applies only to release-1.6; the relevant patches and touches are gone on master :).

@KristofferC, let me know if I should target some other branch :).

cc @rbvermaa

This commit reorders a couple touches in deps/pcre.mkl. Those touches are
intended to prevent patch application from triggering rebuild/reconf.
The present ordering doesn't quite succeed in that objective; patch
application triggers rebuild. On systems with compatible autotools,
the rebuild succeeds and the build is nonetheless happy. On systems
with incompatible versions of autotools, however, the build fails for
need of a reconf. The reordering in this commit prevents the rebuild.

Co-Authored-By: Rob Vermaas <[email protected]>
@staticfloat
Copy link
Member

I think we usually target backports-release-1.6, but other than that this looks good to me!

@Sacha0
Copy link
Member Author

Sacha0 commented Mar 17, 2021

I think we usually target backports-release-1.6, but other than that this looks good to me!

Yes, I targeted release-1.6 because no backports-release-1.6 exists at the moment, the most recent backports branch having recently been merged. Should I create a new backports-release-1.6 branch for this patch to sit on for however long, or should we merge into release-1.6 directly? :)

@KristofferC
Copy link
Member

Included in #40150

@KristofferC KristofferC mentioned this pull request Mar 23, 2021
10 tasks
@Sacha0
Copy link
Member Author

Sacha0 commented Mar 23, 2021

Thanks Kristoffer! :)

@DilumAluthge DilumAluthge deleted the sv-fix-1.6-pcre-build branch March 25, 2021 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants