include coflicted with the STL headers logic; Fixed order
ClosedPublic
Actions

Authored by yuri on Nov 23 2017, 4:40 AM.

Details

Reviewers

tcberner
adamw

Commits

rP455079: net-im/ricochet: Unbroke the build. ${OPENSSLDIR}/include coflicted with the…

Summary

It's strange that it didn't break when it was previously committed a few days ago, but now it was breaking.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

yuri created this revision.Nov 23 2017, 4:40 AM

Herald added a subscriber: mat. · View Herald TranscriptNov 23 2017, 4:40 AM

Harbormaster completed remote builds in B12961: Diff 35628.Nov 23 2017, 4:40 AM

yuri retitled this revision from net-im/ricochet: Unbroke the build. $${OPENSSLDIR}/include coflicted with the STL headers logic. to net-im/ricochet: Unbroke the build. ${OPENSSLDIR}/include coflicted with the STL headers logic..Nov 23 2017, 5:16 AM

Upstreamed: https://github.com/ricochet-im/ricochet/pull/563

yuri edited the summary of this revision. (Show Details)Nov 23 2017, 6:28 PM

This is a simple upstreamed patch unbreaking the build: https://github.com/ricochet-im/ricochet/pull/563

Harbormaster completed remote builds in B13120: Diff 35878.Nov 27 2017, 5:53 PM

yuri retitled this revision from net-im/ricochet: Unbroke the build. ${OPENSSLDIR}/include coflicted with the STL headers logic. to net-im/ricochet: Unbroke the build. ${OPENSSLDIR}/include coflicted with the STL headers logic; Fixed order.Nov 27 2017, 5:54 PM

tcberner accepted this revision.Nov 28 2017, 7:19 PM

tcberner added inline comments.