diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-12-07 16:51:48 +0000 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-12-07 16:51:48 +0000 |
| commit | affbf58a1e52a8e60c830be6a9e0347e0ff4c28e (patch) | |
| tree | 52014b8189012d1b6ff0263cac2d126100225687 /depends | |
| parent | d44fcd3c976572883bbf7f386bc88e2610dc1a58 (diff) | |
build: Move environment variables into `$(package)_config_env`
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/funcs.mk | 1 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/depends/funcs.mk b/depends/funcs.mk index c558ac00ec..2b21d053b1 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -137,6 +137,7 @@ $(1)_config_env+=$($(1)_config_env_$(host_arch)_$(host_os)) $($(1)_config_env_$( $(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig +$(1)_config_env+=PKG_CONFIG_SYSROOT_DIR=/ $(1)_config_env+=CMAKE_MODULE_PATH=$($($(1)_type)_prefix)/lib/cmake $(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH) $(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH) diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index d9ae918d71..2f7ddf6a5f 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -33,6 +33,7 @@ $(package)_extra_sources = $($(package)_qttranslations_file_name) $(package)_extra_sources += $($(package)_qttools_file_name) define $(package)_set_vars +$(package)_config_env = QT_MAC_SDK_NO_VERSION_CHECK=1 $(package)_config_opts_release = -release $(package)_config_opts_release += -silent $(package)_config_opts_debug = -debug @@ -261,9 +262,6 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - export PKG_CONFIG_SYSROOT_DIR=/ && \ - export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \ - export QT_MAC_SDK_NO_VERSION_CHECK=1 && \ cd qtbase && \ ./configure -top-level $($(package)_config_opts) endef |