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

Split make.sh build, fix lints, cleanup #751

Merged
merged 11 commits into from
Feb 23, 2022
Merged

Conversation

prasannavl
Copy link
Member

@prasannavl prasannavl commented Sep 21, 2021

/kind refactor

  • Split make.sh build into deps, conf and make, so it's easier to split these for other tasks analyzers, lints, etc.
  • Simplify extra vars for make, conf and deps:
    • EXTRA_MAKE_ARGS => MAKE_ARGS
    • EXTRA_MAKE_CONF_ARGS => MAKE_CONF_ARGS
    • EXTRA_MAKE_DEPENDS_ARGS => MAKE_DEPS_ARGS
  • Introduce MAKE_JOBS var to target all parallel jobs at once.
  • Introduce MAKE_DEBUG var as convenience to get debug builds (suffixes MAKE_CONF_ARGS with --enable-debug)
  • Introduce MAKE_COMPILER that prepends the compiler flags to MAKE_CONF_ARGS, defaults to clang.
  • Cleanup redundant QT left over args
  • Fix existing shell lints, primarily quotes related.
  • Mild refactor to pkg_install commands (that's only for convenience use - never used directly at the time of this), specifically to cleanup sudo, so it can be used in limited container env which disallow sudo)
  • Add HOST to depends so target is carried forward to keep it platform agnostic (even though we don't really use this anywhere else)

@ShengguangXiao
Copy link
Contributor

So this change will use GCC as the default compiler again? Should we check the minimum GCC version?

@bvbfan bvbfan self-requested a review September 27, 2021 05:37
Copy link
Contributor

@bvbfan bvbfan left a comment

Choose a reason for hiding this comment

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

GCC version should be 10.3 or Clang due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68070

@prasannavl
Copy link
Member Author

More PRs coming soon. Base updates that push the gcc up, and have better consistency to use the same compilers for CI tests and builds.

This change doesn't affect the CI builds though. The docker images still use clang. It only affects local builds.

@prasannavl prasannavl modified the milestones: Planned, Icebox Dec 20, 2021
@prasannavl
Copy link
Member Author

  • Added MAKE_COMPILER flags that prepends the compiler flags to MAKE_CONF_ARGS, which defaults to clang. Should now retain the same behavior, but in a cleaner way and configurable way.

@bvbfan bvbfan self-requested a review February 14, 2022 11:35
@prasannavl prasannavl merged commit acd6ce3 into master Feb 23, 2022
@prasannavl prasannavl deleted the m/refactor-make-sh branch February 23, 2022 05:45
@prasannavl prasannavl added 2.7.0 and removed 2.7.0 labels Mar 7, 2022
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.

4 participants