From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ronja.mits.lan by ronja.mits.lan with LMTP id qF9vM2Xac2YScQAAxxbTJA (envelope-from ); Thu, 20 Jun 2024 09:29:41 +0200 Received: from proxmox-new.maurer-it.com (unknown [192.168.2.33]) by ronja.mits.lan (Postfix) with ESMTPS id B4C3CF645DF; Thu, 20 Jun 2024 09:29:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 97E6F47D4B; Thu, 20 Jun 2024 09:29:41 +0200 (CEST) Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by proxmox-new.maurer-it.com (Proxmox) with ESMTPS; Thu, 20 Jun 2024 09:29:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2CA410571; Thu, 20 Jun 2024 09:29:39 +0200 (CEST) Date: Thu, 20 Jun 2024 09:29:36 +0200 From: Wolfgang Bumiller To: Fabian =?utf-8?Q?Gr=C3=BCnbichler?= Message-ID: References: <20240619143805.2691158-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240619143805.2691158-1-f.gruenbichler@proxmox.com> Subject: [pbs-devel] applied: [PATCH proxmox-backup] build: use cargo wrapper when building package 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 Cc: pbs-devel@lists.proxmox.com Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" X-SPAM-LEVEL: Spam detection results: 0 DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods MAILING_LIST_MULTI -2 Multiple indicators imply a widely-seen list manager RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - applied, thanks On Wed, Jun 19, 2024 at 04:38:05PM GMT, Fabian Gr=FCnbichler wrote: > else we don't pick up the options set by the wrapper, which include gener= ation > of debug symbols. until rustc 1.77, this was not needed because compiled > binaries always included a non-stripped libstd. now, without this change,= the > binaries built with `cargo build --release` have no debug symbols at all > trigger a warning. fix this and include debug symbols when building a pac= kage, > like was originally intended for release package builds. > = > Signed-off-by: Fabian Gr=FCnbichler > --- > no obvious fallout I could find, but more eyes probably don't hurt. 1.77 = is not > in the repository yet, I'll upload it tomorrow.. > = > Makefile | 4 ++-- > debian/rules | 2 +- > docs/Makefile | 4 ++-- > pxar-bin/tests/pxar.rs | 18 +++++++++++------- > 4 files changed, 16 insertions(+), 12 deletions(-) > = > diff --git a/Makefile b/Makefile > index 49575ea45..0b971f9c6 100644 > --- a/Makefile > +++ b/Makefile > @@ -38,9 +38,9 @@ SUBCRATES !=3D cargo metadata --no-deps --format-versio= n=3D1 \ > = > ifeq ($(BUILD_MODE), release) > CARGO_BUILD_ARGS +=3D --release > -COMPILEDIR :=3D target/release > +COMPILEDIR :=3D target/$(DEB_HOST_RUST_TYPE)/release > else > -COMPILEDIR :=3D target/debug > +COMPILEDIR :=3D target/$(DEB_HOST_RUST_TYPE)/debug > endif > = > ifeq ($(valgrind), yes) > diff --git a/debian/rules b/debian/rules > index 54a3c22bf..a82c3e12f 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -8,7 +8,7 @@ include /usr/share/rustc/architecture.mk > = > export BUILD_MODE=3Drelease > = > -CARGO=3D/usr/share/cargo/bin/cargo > +export CARGO=3D/usr/share/cargo/bin/cargo > = > export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS > export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE > diff --git a/docs/Makefile b/docs/Makefile > index d6c61c86e..d23796b7c 100644 > --- a/docs/Makefile > +++ b/docs/Makefile > @@ -90,10 +90,10 @@ SPHINXBUILD =3D sphinx-build > BUILDDIR =3D output > = > ifeq ($(BUILD_MODE), release) > -COMPILEDIR :=3D ../target/release > +COMPILEDIR :=3D ../target/$(DEB_HOST_RUST_TYPE)/release > SPHINXOPTS +=3D -t release > else > -COMPILEDIR :=3D ../target/debug > +COMPILEDIR :=3D ../target/$(DEB_HOST_RUST_TYPE)/debug > SPHINXOPTS +=3D -t devbuild > endif > = > diff --git a/pxar-bin/tests/pxar.rs b/pxar-bin/tests/pxar.rs > index 321f24c31..0a4fbcad5 100644 > --- a/pxar-bin/tests/pxar.rs > +++ b/pxar-bin/tests/pxar.rs > @@ -7,15 +7,17 @@ fn pxar_create_and_extract() { > let src_dir =3D "../tests/catar_data/test_xattrs_src/"; > let dest_dir =3D "../tests/catar_data/test_xattrs_dest/"; > = > + let target_subdir =3D std::env::var("DEB_HOST_RUST_TYPE").unwrap_or(= String::new()); > + > let exec_path =3D if cfg!(debug_assertions) { > - "../target/debug/pxar" > + format!("../target/{target_subdir}/debug/pxar") > } else { > - "../target/release/pxar" > + format!("../target/{target_subdir}/release/pxar") > }; > = > println!("run '{} create archive.pxar {}'", exec_path, src_dir); > = > - Command::new(exec_path) > + Command::new(&exec_path) > .arg("create") > .arg("./tests/archive.pxar") > .arg(src_dir) > @@ -24,7 +26,7 @@ fn pxar_create_and_extract() { > = > println!("run '{} extract archive.pxar {}'", exec_path, dest_dir); > = > - Command::new(exec_path) > + Command::new(&exec_path) > .arg("extract") > .arg("./tests/archive.pxar") > .arg("--target") > @@ -81,13 +83,15 @@ fn pxar_create_and_extract() { > = > #[test] > fn pxar_list_with_payload_input() { > + let target_subdir =3D std::env::var("DEB_HOST_RUST_TYPE").unwrap_or(= String::new()); > + > let exec_path =3D if cfg!(debug_assertions) { > - "../target/debug/pxar" > + format!("../target/{target_subdir}/debug/pxar") > } else { > - "../target/release/pxar" > + format!("../target/{target_subdir}/release/pxar") > }; > = > - let output =3D Command::new(exec_path) > + let output =3D Command::new(&exec_path) > .args([ > "list", > "../tests/pxar/backup-client-pxar-expected.mpxar", > -- = > 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel