Skip to content

[CentOS 8] Dont patch any files and start building ninja #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

shahmishal
Copy link
Member

No description provided.

@shahmishal shahmishal requested a review from tomerd October 2, 2021 19:06
@shahmishal shahmishal mentioned this pull request Oct 2, 2021
@tomerd
Copy link
Contributor

tomerd commented Oct 2, 2021

@shahmishal #30 haha :D

@tomerd
Copy link
Contributor

tomerd commented Oct 2, 2021

there is some overlap but also looks like you were able to get rid from more patches. so either we combine into one or we merge one then rebase the other

@shahmishal
Copy link
Member Author

@shahmishal #30 haha :D

Haha, I thought we talked offline about this yesterday. I might have miss understood who is working on it.

@tomerd
Copy link
Contributor

tomerd commented Oct 2, 2021

Haha, I thought we talked offline about this yesterday. I might have miss understood who is working on it.

no worried lets take your and we can rebase mine with the additional fixes for tarball names on top

@shahmishal
Copy link
Member Author

Haha, I thought we talked offline about this yesterday. I might have miss understood who is working on it.

no worried lets take your and we can rebase mine with the additional fixes for tarball names on top

Open to either PR :)

@tomerd
Copy link
Contributor

tomerd commented Oct 2, 2021

Open to either PR :)

lets start with yours, added some comments inline

@@ -22,9 +22,6 @@ RUN yum-builddep -y /root/rpmbuild/SPECS/swift-lang.spec
# Get the sources for Swift as defined in the spec file
RUN spectool -g -R /root/rpmbuild/SPECS/swift-lang.spec

# Add the patches
ADD patches/*.patch /root/rpmbuild/SOURCES/
Copy link
Contributor

Choose a reason for hiding this comment

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

keep this in case we have patches in the future

Copy link
Member Author

Choose a reason for hiding this comment

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

We should avoid patches, and have this resolved before release.

Copy link
Contributor

Choose a reason for hiding this comment

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

sure we can add it back if we need it

@shahmishal shahmishal force-pushed the dont-patch-and-build-ninja branch from f236d35 to 8b0ca56 Compare October 2, 2021 23:01
@shahmishal
Copy link
Member Author

We still need two patches:

  • hwasan_symbolize.patch
  • swift-api-checker.patch

This will fix the Swift patch - swiftlang/swift#39614

@shahmishal shahmishal closed this Oct 6, 2021
@shahmishal shahmishal deleted the dont-patch-and-build-ninja branch October 6, 2021 17:44
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.

2 participants