depends: Small tweaks in bls-dash and immer packages (#4391)

* depends: Use `_staging_dir` in `bls-dash` and `immer` packages the way it's suggested in `depends/packages.md`

* depends: Do not build static binaries in `bls-dash` package
This commit is contained in:
UdjinM6 2021-09-07 03:22:48 +03:00 committed by GitHub
parent 4b4b675d6d
commit 7a68820b44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -33,9 +33,9 @@ define $(package)_extract_cmds
endef
define $(package)_set_vars
$(package)_config_opts=-DCMAKE_INSTALL_PREFIX=$($(package)_staging_dir)/$(host_prefix)
$(package)_config_opts=-DCMAKE_INSTALL_PREFIX=$(host_prefix)
$(package)_config_opts+= -DCMAKE_PREFIX_PATH=$(host_prefix)
$(package)_config_opts+= -DSTLIB=ON -DSHLIB=OFF -DSTBIN=ON
$(package)_config_opts+= -DSTLIB=ON -DSHLIB=OFF -DSTBIN=OFF
$(package)_config_opts+= -DBUILD_BLS_PYTHON_BINDINGS=0 -DBUILD_BLS_TESTS=0 -DBUILD_BLS_BENCHMARKS=0
$(package)_config_opts_linux=-DOPSYS=LINUX -DCMAKE_SYSTEM_NAME=Linux
$(package)_config_opts_darwin=-DOPSYS=MACOSX -DCMAKE_SYSTEM_NAME=Darwin
@ -79,5 +79,5 @@ define $(package)_build_cmds
endef
define $(package)_stage_cmds
$(MAKE) install
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

View File

@ -12,8 +12,8 @@ $(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_f
endef
define $(package)_set_vars
$(package)_config_opts=-DCMAKE_INSTALL_INCLUDEDIR=$($(package)_staging_dir)/$(host_prefix)/include
$(package)_config_opts+=-DCMAKE_INSTALL_LIBDIR=$($(package)_staging_dir)/$(host_prefix)/lib
$(package)_config_opts=-DCMAKE_INSTALL_INCLUDEDIR=$(host_prefix)/include
$(package)_config_opts+=-DCMAKE_INSTALL_LIBDIR=$(host_prefix)/lib
$(package)_config_opts_linux=-DCMAKE_SYSTEM_NAME=Linux
$(package)_config_opts_darwin=-DCMAKE_SYSTEM_NAME=Darwin
$(package)_config_opts_mingw32=-DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=""
@ -37,5 +37,5 @@ define $(package)_build_cmds
endef
define $(package)_stage_cmds
$(MAKE) install
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef