monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-29 20:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9199

Browse source 
5fdd67d depends: {native_,}protobuf: speedup build (tobtoht)
3c16794 build: force Trezor for depends builds (tobtoht)
This commit is contained in:
luigi1111 2024-05-20 23:14:03 -05:00
commit 49aa0ff1cb
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -48,7 +48,7 @@ all: release-all
depends: depends:
cd contrib/depends && $(MAKE) HOST=$(target) && cd ../.. && mkdir -p build/$(target)/release cd contrib/depends && $(MAKE) HOST=$(target) && cd ../.. && mkdir -p build/$(target)/release
cd build/$(target)/release && cmake -DCMAKE_TOOLCHAIN_FILE=$(CURDIR)/contrib/depends/$(target)/share/toolchain.cmake ../../.. && $(MAKE) cd build/$(target)/release && USE_DEVICE_TREZOR_MANDATORY=1 cmake -DCMAKE_TOOLCHAIN_FILE=$(CURDIR)/contrib/depends/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
cmake-debug: cmake-debug:
mkdir -p $(builddir)/debug mkdir -p $(builddir)/debug

8
contrib/depends/packages/native_protobuf.mk
View file

@ -1,4 +1,4 @@
package=protobuf3 package=native_protobuf
$(package)_version=21.12 $(package)_version=21.12
$(package)_version_protobuf_cpp=3.21.12 $(package)_version_protobuf_cpp=3.21.12
$(package)_download_path=https://github.com/protocolbuffers/protobuf/releases/download/v$($(package)_version)/ $(package)_download_path=https://github.com/protocolbuffers/protobuf/releases/download/v$($(package)_version)/
@ -16,13 +16,13 @@ define $(package)_config_cmds
endef endef
define $(package)_build_cmds define $(package)_build_cmds
$(MAKE) -C src $(MAKE) -C src protoc
endef endef
define $(package)_stage_cmds define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) -C src install $(MAKE) DESTDIR=$($(package)_staging_dir) -C src install-binPROGRAMS install-nobase_dist_protoDATA
endef endef
define $(package)_postprocess_cmds define $(package)_postprocess_cmds
rm lib/libprotoc.a rm -rf lib/
endef endef

11
contrib/depends/packages/protobuf.mk
View file

@ -21,12 +21,7 @@ define $(package)_build_cmds
endef endef
define $(package)_stage_cmds define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) -C src install-libLTLIBRARIES install-nobase_includeHEADERS &&\ $(MAKE) DESTDIR=$($(package)_staging_dir) -C src install-nobase_includeHEADERS &&\
$(MAKE) DESTDIR=$($(package)_staging_dir) install-pkgconfigDATA $(MAKE) DESTDIR=$($(package)_staging_dir) install-pkgconfigDATA &&\
cp src/.libs/libprotobuf.a $($(package)_staging_prefix_dir)/lib/
endef endef
define $(package)_postprocess_cmds
rm lib/libprotoc.a &&\
rm lib/*.la
endef