From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A753D1FF173 for ; Mon, 13 Jan 2025 15:43:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 609FB2976; Mon, 13 Jan 2025 15:43:16 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 13 Jan 2025 15:42:24 +0100 Message-Id: <20250113144226.467408-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250113144226.467408-1-c.ebner@proxmox.com> References: <20250113144226.467408-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH v2 proxmox-backup 3/5] Makefile: switch path based on build mode and target X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Define variables for the compile path and target and use these instead of hard-coding the path. Allows to easily switch between debug and release mode for compilation. Also, place the libsystemd stub into its own subdirectory for cleaner separation from the compiled artifacts. Signed-off-by: Christian Ebner --- changes since version 1: - use dedicated variables for compile dir and build target - place libsystemd stub into dedicated directory for clear separation Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 00e7f7401..428ef40b9 100644 --- a/Makefile +++ b/Makefile @@ -36,11 +36,15 @@ SUBCRATES != cargo metadata --no-deps --format-version=1 \ | grep "$$PWD/" \ | sed -e "s!.*$$PWD/!!g" -e 's/\#.*$$//g' -e 's/)$$//g' +STATIC_TARGET ?= x86_64-unknown-linux-gnu + ifeq ($(BUILD_MODE), release) CARGO_BUILD_ARGS += --release COMPILEDIR := target/$(DEB_HOST_RUST_TYPE)/release +STATIC_COMPILEDIR := target/$(STATIC_TARGET)/release else COMPILEDIR := target/$(DEB_HOST_RUST_TYPE)/debug +STATIC_COMPILEDIR := target/$(STATIC_TARGET)/debug endif ifeq ($(valgrind), yes) @@ -230,9 +234,9 @@ upload: $(SERVER_DEB) $(CLIENT_DEB) $(RESTORE_DEB) $(DOC_DEB) .PHONY: proxmox-backup-client-static proxmox-backup-client-static: - mkdir -p target/release/deps/ && \ - echo '!' > target/release/deps/libsystemd.a # workaround for to greedy linkage and proxmox-systemd - RUSTFLAGS='-C target-feature=+crt-static -C strip=debuginfo' \ + mkdir -p $(STATIC_COMPILEDIR)/deps-stubs/ && \ + echo '!' > $(STATIC_COMPILEDIR)/deps-stubs/libsystemd.a # workaround for to greedy linkage and proxmox-systemd + RUSTFLAGS='-C target-feature=+crt-static -C strip=debuginfo -L $(STATIC_COMPILEDIR)/deps-stubs/' \ $(CARGO) build $(CARGO_BUILD_ARGS) \ --package proxmox-backup-client --bin proxmox-backup-client \ - --target x86_64-unknown-linux-gnu + --target $(STATIC_TARGET) -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel