diff options
| author | tobtoht <tob@featherwallet.org> | 2024-02-23 10:56:52 +0100 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2024-02-23 10:58:11 +0100 |
| commit | 5fdd67d738d448d69308bcbcb91f2a6c35565b24 (patch) | |
| tree | 66816c69e27f398fef5a967844a1f2bcd57e3575 /contrib | |
| parent | build: force Trezor for depends builds (diff) | |
| download | monero-5fdd67d738d448d69308bcbcb91f2a6c35565b24.tar.xz | |
depends: {native_,}protobuf: speedup build
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/packages/native_protobuf.mk | 8 | ||||
| -rw-r--r-- | contrib/depends/packages/protobuf.mk | 11 |
2 files changed, 7 insertions, 12 deletions
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 - |