Skip to content
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

New package: scheme48-1.9.2 #12434

Merged
merged 1 commit into from Jun 19, 2019

Conversation

@rc-05
Copy link
Contributor

commented Jun 12, 2019

No description provided.

@not-chicken

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

Hi @rc-05, thanks for your contribution!
Seems like you accidentally pushed some extra commits.
You can drop them using git rebase -i HEAD~3 which will open up your text editor showing your last 3 commits. Replace the pick in front of those commits you want to remove from here with drop, then save and quit.
Finally (force)push the changes here using git push -f.

# Template file for 'scheme48'
pkgname=scheme48
version=1.9
revision=2

This comment has been minimized.

Copy link
@Chocimier

Chocimier Jun 13, 2019

Contributor

revision is used to distinguish consecutive Void builds of program from same sources. Please set version to 1.9.2, revision to 1, drop wrksrc and adapt usages of $version.

pkgname=scheme48
version=1.9
revision=2
archs="x86_64 x86_64-musl"

This comment has been minimized.

Copy link
@Chocimier

Chocimier Jun 13, 2019

Contributor

The problem is cross compiling, not tying to architecture. Use nocross="failed to compile test program" instead.

configure_args="--prefix=/usr"
short_desc="Implementation of the R5RS Scheme standard"
maintainer="rc-05 <rc23@email.it>"
license="custom"

This comment has been minimized.

Copy link
@Chocimier

Chocimier Jun 13, 2019

Contributor

Please use custom:scheme48, as per Manual.md.

@rc-05 rc-05 closed this Jun 15, 2019
@rc-05 rc-05 reopened this Jun 15, 2019
@rc-05 rc-05 changed the title New package: scheme48-1.9_2 New package: scheme48-1.9.2 Jun 15, 2019
@rc-05

This comment has been minimized.

Copy link
Contributor Author

commented Jun 16, 2019

Corrected some mistakes in the template file and deleted the ProTracker package node (that's what was causing the failure of the Travis CI tests). Sorry for closing the pull request and re-opening it yesterday.

@Chocimier

This comment has been minimized.

Copy link
Contributor

commented Jun 17, 2019

Just small changes are needed before merge:
--prefix=/usr is set by build style by default, remove it.
File should end with newline character, but no empty line also.
Branch history should be rewritten so it contain one commit.

@rc-05

This comment has been minimized.

Copy link
Contributor Author

commented Jun 18, 2019

Just small changes are needed before merge:
--prefix=/usr is set by build style by default, remove it.
File should end with newline character, but no empty line also.
Branch history should be rewritten so it contain one commit.

I'm having trouble squashing everything together as a single commit because of a merge commit that i did...

@Chocimier

This comment has been minimized.

Copy link
Contributor

commented Jun 18, 2019

@rc-05

This comment has been minimized.

Copy link
Contributor Author

commented Jun 19, 2019

Alright, deleted a unnecessary commit for ProTracker and rebased everything so that only one commit is present.

@Chocimier Chocimier merged commit 9480c9a into void-linux:master Jun 19, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.