diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-05-20 23:14:03 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-05-20 23:14:03 -0500 |
| commit | 49aa0ff1cb0e1ec5aba6a923d3541ae01d53c9e7 (patch) | |
| tree | eaf37e715bd645ede86c8c2e96175296677df021 | |
| parent | Merge pull request #9198 (diff) | |
| parent | depends: {native_,}protobuf: speedup build (diff) | |
| download | monero-49aa0ff1cb0e1ec5aba6a923d3541ae01d53c9e7.tar.xz | |
Merge pull request #9199
5fdd67d depends: {native_,}protobuf: speedup build (tobtoht)
3c16794 build: force Trezor for depends builds (tobtoht)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | contrib/depends/packages/native_protobuf.mk | 8 | ||||
| -rw-r--r-- | contrib/depends/packages/protobuf.mk | 11 |
3 files changed, 8 insertions, 13 deletions
@@ -48,7 +48,7 @@ all: release-all depends: 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: mkdir -p $(builddir)/debug diff --git a/contrib/depends/packages/native_protobuf.mk b/contrib/depends/packages/native_protobuf.mk index 2dc11b23c..8d7649b67 100644 --- a/contrib/depends/packages/native_protobuf.mk +++ b/contrib/depends/packages/native_protobuf.mk @@ -1,4 +1,4 @@ -package=protobuf3 +package=native_protobuf $(package)_version=21.12 $(package)_version_protobuf_cpp=3.21.12 $(package)_download_path=https://github.com/protocolbuffers/protobuf/releases/download/v$($(package)_version)/ @@ -16,13 +16,13 @@ define $(package)_config_cmds endef define $(package)_build_cmds - $(MAKE) -C src + $(MAKE) -C src protoc endef 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 define $(package)_postprocess_cmds - rm lib/libprotoc.a + rm -rf lib/ endef diff --git a/contrib/depends/packages/protobuf.mk b/contrib/depends/packages/protobuf.mk index 780357c90..9702506d0 100644 --- a/contrib/depends/packages/protobuf.mk +++ b/contrib/depends/packages/protobuf.mk @@ -21,12 +21,7 @@ define $(package)_build_cmds endef define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) -C src install-libLTLIBRARIES install-nobase_includeHEADERS &&\ - $(MAKE) DESTDIR=$($(package)_staging_dir) install-pkgconfigDATA + $(MAKE) DESTDIR=$($(package)_staging_dir) -C src install-nobase_includeHEADERS &&\ + $(MAKE) DESTDIR=$($(package)_staging_dir) install-pkgconfigDATA &&\ + cp src/.libs/libprotobuf.a $($(package)_staging_prefix_dir)/lib/ endef - -define $(package)_postprocess_cmds - rm lib/libprotoc.a &&\ - rm lib/*.la -endef - |