dependencies: Add command line option for pkg_config_path #4931

dcbaker · 2019-02-14T18:46:01Z

This creates a new command line option to store pkg_config_path into,
and store the environment variable into that option. Currently this
works like the environment variable, for both cross and native targets.

jpakkane · 2019-02-21T21:15:10Z

Like all PRs that add options, this puts pressure to fix #4574 somehow.

nirbheek · 2019-02-21T23:07:23Z

Shouldn't this go into the native file first?

anholt · 2019-03-14T16:06:50Z

It sounds like this is Mesa's last requirement before we can delete autotools.

dcbaker · 2019-03-14T16:27:48Z

@nirbeek, @jpakkane, are you asking for #5061 to land first? This really is the last feature blocking mesa making meson the default build-system for !windows.

jpakkane · 2019-03-14T21:51:03Z

How does this work together with cross compilation? FWICT this should only be used for native lookup but not for cross lookup (because it uses a prefixed pkgconfig that should have all of these things already defined).

anholt · 2019-03-14T22:26:53Z

For my cross compilation I still want to be able to set pkg_config_path to my personal install prefix (just like I do for non-cross compiles), not just what the cross tool provides.

nirbheek · 2019-03-15T10:13:25Z

Sounds like we want to namespace this command-line option separately for native and cross builds, and also allow it to be set in the native and cross files.

nirbheek · 2019-03-15T10:15:21Z

@nirbeek, @jpakkane, are you asking for #5061 to land first? This really is the last feature blocking mesa making meson the default build-system for !windows.

Since this is important for Mesa, we don't have to block on #5061, but I think namespacing of the option is important.

dcbaker · 2019-03-18T18:50:59Z

I'm becoming convinced that we really want our arguments to target the host rather than the build target. I generally don't care if some tool I need to build and use as part of my build process is built with some set of args but I really do care about that for the host, wether host == build or not. I know that's a behavioral change and probably deserves a separate discussion, but I feel like we keep coming back to this.

dcbaker · 2019-04-03T18:01:45Z

We've added the 'cross_' prefix as a reserved prefix now, do I need to implement support for passing -Dcross_* before this lands?

Currently the builtins are stored as lists, then there are a mess of functions which take said lists, check what the type of the first thing is, and then extract data from various points in the list based on that. This is stupid. This is what structs/classes are for.

This returns a list out of th keys of a dict. In both cases of use remaining though it's used for checking membership, checking for list membership, lists are O(n) lookup, while dicts are O(1), so removing the abstraction reduces typing and improves performance.

This is a silly abstraction at this point.

Since the attribute is always accessible from a BuiltinOptions instance we don't need a special function for this.

We can remove some guards here since we know the object will have certain attributes.

It really is a method of the BuiltinOption class, not a standalone function.

dcbaker · 2019-04-04T22:53:48Z

Alright, I've added the cross_pkg_config_path argument (a bunch of cleanup was required to get there), hopefully this is closer to the form people were wanted.

mesonbuild/dependencies/base.py

mesonbuild/msetup.py

mesonbuild/coredata.py

nirbheek

Overall, I like this and it's good cleanup too. One thing I'm increasingly concerned about is that user options and built-in options share the same namespace, which means we increasingly have a chance to break someone's build files when we add new ones.

It's something we should think about, but it's not related to this PR of course and shouldn't block it.

Since we're adding arguments that use the cross_ prefix but are valid we don't want to print "warning invalid argument name!", as that will confuse people by virtue of being wrong.

dcbaker · 2019-04-05T16:28:01Z

I don't understand why the cross tests are failing to run, but I've added a couple extra patches to silence the warnings about "cross_" prefix used when that prefix is part of a builtin option.

I don't konw how the heck this has ever worked, but you know.

This creates a new command line option to store pkg_config_path into, and store the environment variable into that option. Currently this works like the environment variable, for both cross and native targets.

Currently this only marks the pkg_config_path flag, but it could be used to mark any of these values as having separate values for cross and native builds, assuming that the necessary plumbing is done.

Ericson2314 · 2019-04-07T14:39:06Z

Good change!

I'm becoming convinced that we really want our arguments to target the host rather than the build target. I generally don't care if some tool I need to build and use as part of my build process is built with some set of args but I really do care about that for the host, wether host == build or not. I know that's a behavioral change and probably deserves a separate discussion, but I feel like we keep coming back to this.

Yes indeed! Let's finish this off in #4963 ? There's a slew of interface changes my distro desperately wants depending on everyone reaching an understanding here.

TheQwertiest · 2019-04-09T09:31:15Z

@dcbaker , as far as I understand, this PR added support for cross_* options (e.g. cross_cpp_args), shouldn't this be documented somewhere? Cause it's quite useful (and important) feature.

nirbheek · 2019-04-09T10:32:27Z

as far as I understand, this PR added support for cross_* options (e.g. cross_cpp_args),

It added the infrastructure for it, but it did not enable it. See: 377b652

TheQwertiest · 2019-04-09T10:36:22Z

mesonbuild/coredata.py

+    'optimization':    BuiltinOption(UserComboOption, 'Optimization level', '0', choices=['0', 'g', '1', '2', '3', 's']),
+    'debug':           BuiltinOption(UserBooleanOption, 'Debug', True),
+    'wrap_mode':       BuiltinOption(UserComboOption, 'Wrap mode', 'default', choices=['default', 'nofallback', 'nodownload', 'forcefallback']),
+    'pkg_config_path': BuiltinOption(UserArrayOption, 'List of additional paths for pkg-config to search', [], separate_cross=True),


This should be added to https://github.com/mesonbuild/meson/blob/master/docs/markdown/Builtin-options.md

Yes, we should also add a unit test for it so that it doesn't happen again.

@nirbheek I could write such unit test ~~, but that will require the exposure of global builtin_options var through some means (according to my limited knowledge it's impossible to access global vars directly from other files/scripts)~~

See: run_unittests.py:DataTests(), we already have a test for the compiler options. The same can be done for builtin options too.

TheQwertiest · 2019-04-09T10:40:01Z

It added the infrastructure for it, but it did not enable it

Oh, right, sorry. I've misunderstood the meaning of separate_cross

As per mesonbuild#4931 (comment)

Ericson2314 · 2019-04-30T14:44:18Z

FYI #5263 would give us build_pkg_config_path and host_pkg_config_path. It also makes plain pkg_config_path a "setter" which updates both for a) backwards compatibility.

dcbaker force-pushed the pkg-config-builtin branch from bf36ae1 to 6451f80 Compare April 3, 2019 18:01

dcbaker added 9 commits April 4, 2019 15:02

coredata: Remove is_builtin_option

f8fcc71

This is a silly abstraction at this point.

coredata: Move argparse action getterin into BuiltinOption class

6940848

coredata: Remove get_builtin_option_description

1e5496d

Since the attribute is always accessible from a BuiltinOptions instance we don't need a special function for this.

coredata: pull get_builtin_option_choices into BuiltinOption

5aa2219

We can remove some guards here since we know the object will have certain attributes.

coredata: merge get_builtin_option_default in to BuiltinOption

c3cb966

coredata: Merge get_builtin_option_cmdline_name into BuiltinOption

1d7eda5

coredata: Fold add_builtin_argument into BuiltinOption

863de72

It really is a method of the BuiltinOption class, not a standalone function.

dcbaker force-pushed the pkg-config-builtin branch from 6451f80 to 54439d4 Compare April 4, 2019 22:52

dcbaker added this to the 0.51.0 milestone Apr 4, 2019

nirbheek reviewed Apr 4, 2019

View reviewed changes

mesonbuild/dependencies/base.py Outdated Show resolved Hide resolved

nirbheek reviewed Apr 4, 2019

View reviewed changes

mesonbuild/msetup.py Show resolved Hide resolved

nirbheek reviewed Apr 4, 2019

View reviewed changes

mesonbuild/coredata.py Show resolved Hide resolved

nirbheek reviewed Apr 4, 2019

View reviewed changes

dcbaker force-pushed the pkg-config-builtin branch 2 times, most recently from 87187e9 to 937a52d Compare April 4, 2019 23:32

optinterpreter: Add type annotations to is_invalid_name

05ad69a

dcbaker added 2 commits April 5, 2019 09:26

optinterpreter: Add a log argument to is_invalid_name

068c3bf

Since we're adding arguments that use the cross_ prefix but are valid we don't want to print "warning invalid argument name!", as that will confuse people by virtue of being wrong.

coredata: Don't log warnings about reserved prefixes

5ce0d9f

dcbaker force-pushed the pkg-config-builtin branch from 937a52d to 60cc039 Compare April 5, 2019 16:27

dcbaker mentioned this pull request Apr 5, 2019

Add warnings when environment variables change and wont be honored #5223

Open

dcbaker added 4 commits April 5, 2019 15:08

run_cross_tests: Pass correct argument

25eb863

I don't konw how the heck this has ever worked, but you know.

dependencies: Add command line option for pkg_config_path

569e646

This creates a new command line option to store pkg_config_path into, and store the environment variable into that option. Currently this works like the environment variable, for both cross and native targets.

coredata: Add ability to mark options as having separate cross values

377b652

Currently this only marks the pkg_config_path flag, but it could be used to mark any of these values as having separate values for cross and native builds, assuming that the necessary plumbing is done.

dependencies/pkg-config: Add support for different cross_flags

91b2475

dcbaker force-pushed the pkg-config-builtin branch from 60cc039 to 91b2475 Compare April 5, 2019 22:08

nirbheek merged commit ef87d11 into mesonbuild:master Apr 7, 2019

Ericson2314 mentioned this pull request Apr 7, 2019

RFC: Proposal to rework c_args and friends #4963

Closed

TheQwertiest reviewed Apr 9, 2019

View reviewed changes

TheQwertiest added a commit to TheQwertiest/meson that referenced this pull request Apr 9, 2019

Added a unit test for built-in options docs

dd19898

As per mesonbuild#4931 (comment)

TheQwertiest mentioned this pull request Apr 9, 2019

Added a unit test for built-in options docs #5233

Merged

dcbaker deleted the pkg-config-builtin branch April 9, 2019 15:59

TheQwertiest added a commit to TheQwertiest/meson that referenced this pull request Apr 9, 2019

Added a unit test for built-in options docs

cfa8dbc

As per mesonbuild#4931 (comment)

TheQwertiest added a commit to TheQwertiest/meson that referenced this pull request Apr 10, 2019

Added a unit test for built-in options docs

0935499

As per mesonbuild#4931 (comment)

TheQwertiest added a commit to TheQwertiest/meson that referenced this pull request Apr 11, 2019

Added a unit test for built-in options docs

4d6e0b2

As per mesonbuild#4931 (comment)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dependencies: Add command line option for pkg_config_path #4931

dependencies: Add command line option for pkg_config_path #4931

dcbaker commented Feb 14, 2019

jpakkane commented Feb 21, 2019

nirbheek commented Feb 21, 2019

anholt commented Mar 14, 2019

dcbaker commented Mar 14, 2019

jpakkane commented Mar 14, 2019

anholt commented Mar 14, 2019

nirbheek commented Mar 15, 2019

nirbheek commented Mar 15, 2019

dcbaker commented Mar 18, 2019

dcbaker commented Apr 3, 2019

dcbaker commented Apr 4, 2019

nirbheek left a comment

dcbaker commented Apr 5, 2019

Ericson2314 commented Apr 7, 2019

TheQwertiest commented Apr 9, 2019

nirbheek commented Apr 9, 2019

TheQwertiest Apr 9, 2019

nirbheek Apr 9, 2019

TheQwertiest Apr 9, 2019 •

edited

Loading

nirbheek Apr 9, 2019

TheQwertiest Apr 9, 2019

TheQwertiest commented Apr 9, 2019

Ericson2314 commented Apr 30, 2019

dependencies: Add command line option for pkg_config_path #4931

dependencies: Add command line option for pkg_config_path #4931

Conversation

dcbaker commented Feb 14, 2019

jpakkane commented Feb 21, 2019

nirbheek commented Feb 21, 2019

anholt commented Mar 14, 2019

dcbaker commented Mar 14, 2019

jpakkane commented Mar 14, 2019

anholt commented Mar 14, 2019

nirbheek commented Mar 15, 2019

nirbheek commented Mar 15, 2019

dcbaker commented Mar 18, 2019

dcbaker commented Apr 3, 2019

dcbaker commented Apr 4, 2019

nirbheek left a comment

Choose a reason for hiding this comment

dcbaker commented Apr 5, 2019

Ericson2314 commented Apr 7, 2019

TheQwertiest commented Apr 9, 2019

nirbheek commented Apr 9, 2019

TheQwertiest Apr 9, 2019

Choose a reason for hiding this comment

nirbheek Apr 9, 2019

Choose a reason for hiding this comment

TheQwertiest Apr 9, 2019 • edited Loading

Choose a reason for hiding this comment

nirbheek Apr 9, 2019

Choose a reason for hiding this comment

TheQwertiest Apr 9, 2019

Choose a reason for hiding this comment

TheQwertiest commented Apr 9, 2019

Ericson2314 commented Apr 30, 2019

TheQwertiest Apr 9, 2019 •

edited

Loading