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

Support commented out lines in the PATCHES section. #254

Merged
merged 1 commit into from
Jun 15, 2024

Conversation

OscarL
Copy link
Contributor

@OscarL OscarL commented Apr 30, 2023

We could have commented out lines in PROVIDES, and REQUIRES, but not in PATCHES, as those lines weren't being filtered out, ending on "file not found" errors further down.

We could have commented out lines in PROVIDES, and REQUIRES, but
not in PATCHES, as those lines weren't being filtered out, ending
on "file not found" errors further down.
@OscarL
Copy link
Contributor Author

OscarL commented May 15, 2023

Some examples, to explain what I'm after....

Currently we can have:

PROVIDES="
    super_app
    cmd:awesome_bin
#    cmd:leaving_this_out_for_now
    "

or:

REQUIRES="
    haiku
    lib:libwhatever
#    lib:might_need_this_one_depending_on_build_options
    "

This PR add support for doing similar, but on PATCHES, as in:

PATCHES="
    main.patchset
#    optional_patch_from_debian.diff
    another_patch_from_debian.patch
    "

Currently, the latter just errors out. Not a biggie, but I think being consistent on allowing commented lines in multi-lines blocks is nice.

@Begasus Begasus merged commit 49f29cb into haikuports:master Jun 15, 2024
@Begasus
Copy link
Contributor

Begasus commented Jun 15, 2024

A little background on the merge from my side, I tend to grab patches (or search them) from other resources, check them out and sometimes they don't apply, I always had to remove the mentioned line to continue.
This is especialy handy for these things, not specific to buildmasters. Thanks @OscarL !

@OscarL OscarL deleted the commented_out_patches branch June 15, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants