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

cross-meson.mk: Fix build issue - conflict commits #4356 #4349 #4386

Merged
merged 1 commit into from
Jan 14, 2021

Conversation

th0ma7
Copy link
Contributor

@th0ma7 th0ma7 commented Jan 13, 2021

Motivation: Solves building using meson environment. Fix a merge conflicting changes between #4356 and #4349
Linked issues: #4379

Checklist

  • Build rule all-supported completed successfully
  • Package upgrade completed successfully
  • New installation of package completed successfully

@th0ma7 th0ma7 requested a review from hgy59 January 13, 2021 12:07
@th0ma7 th0ma7 linked an issue Jan 13, 2021 that may be closed by this pull request
@hgy59 hgy59 merged commit dcc5a1c into SynoCommunity:master Jan 14, 2021
@hgy59
Copy link
Contributor

hgy59 commented Jan 19, 2021

@th0ma7 this was not a merge conflict. It was my intention to replace warning by error, after I successfully tested it.
But with #4396 I realize now, that it did not work when not using the spksrc-docker-image as build environment (for what reason ever...).

@th0ma7
Copy link
Contributor Author

th0ma7 commented Jan 20, 2021

@hgy59 actually it's a little funnier than that: https://github.com/SynoCommunity/spksrc/commits/master/mk/spksrc.cross-meson-env.mk

  1. fix meson build #4348 you added error
  2. update meson build #4349 you migrated error to warning
  3. fix dependency targets #4356 you re-inserted back error with the DEPENDENCY_WALK (perhaps using non-rebased code?)

@hgy59
Copy link
Contributor

hgy59 commented Jan 20, 2021

@th0ma7 exactly what I said
I migrated error to warning as errors where thrown with dependency-list target
After I was sure that dependency-list was fixed with DEPENDENCY_WALK I reactivated with error instead of warning.

Finally I am still confused why it was not fixed with DEPENDENCY_WALK as in #4396 the error was correctly thrown as meson was not installed.

@th0ma7 th0ma7 deleted the meson-cross-fix branch April 23, 2021 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

meson build error
2 participants