From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] rdedup: fix cross
Date: Sat, 15 Jun 2019 16:37:30 +0200 [thread overview]
Message-ID: <20190615143730.RrGG-zRMKso0csrPO1vx3HRFmtRjEvPu4eBD7EanECo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12468@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages rededup
https://github.com/void-linux/void-packages/pull/12468
[WIP] rdedup: fix cross
A patch file from https://github.com/void-linux/void-packages/pull/12468.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rededup-12468.patch --]
[-- Type: application/text/x-diff, Size: 2990 bytes --]
From 0657ef65630dc997118da019c5129521e5a12609 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 15 Jun 2019 13:36:02 +0200
Subject: [PATCH 1/2] rdedup: fix cross
---
srcpkgs/rdedup/patches/bindgen-cross.patch | 12 ++++++++++++
srcpkgs/rdedup/template | 13 +++++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/rdedup/patches/bindgen-cross.patch
diff --git a/srcpkgs/rdedup/patches/bindgen-cross.patch b/srcpkgs/rdedup/patches/bindgen-cross.patch
new file mode 100644
index 00000000000..dd07d48b99c
--- /dev/null
+++ b/srcpkgs/rdedup/patches/bindgen-cross.patch
@@ -0,0 +1,12 @@
+patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
+https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args
+
+--- Cargo.toml.orig 2019-06-15 13:18:05.509893680 +0200
++++ Cargo.toml 2019-06-15 13:19:48.854887006 +0200
+@@ -53,3 +53,6 @@
+ slog-term = "2"
+ slog-async = "2"
+ url = "1"
++
++[patch.crates-io]
++bindgen = {git = 'https://github.com/jnbr/rust-bindgen', rev = '4afb05213b3e7e0ec928b84ea85d9f2b99477586'}
diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 351259b7030..671165b1c07 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,18 +1,23 @@
# Template file for 'rdedup'
pkgname=rdedup
version=3.1.1
-revision=2
+revision=3
wrksrc=rdedup-rdedup-v${version}
build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="libressl-devel liblzma-devel libsodium-devel clang"
+hostmakedepends="pkg-config clang"
+makedepends="libressl-devel liblzma-devel libsodium-devel"
short_desc="Data deduplication engine"
maintainer="Renato Aguiar <renato@renag.me>"
license="MPL-2.0"
homepage="https://github.com/dpc/rdedup"
distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz"
checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28
-nocross="error: failed to run custom build command for libloading v0.5.0"
+
+if [ "$CROSS_BUILD" ]; then
+ export HOST_CC="$BUILD_CC"
+ export HOST_CFLAGS="$BUILD_CFLAGS"
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE}"
+fi
pre_build() {
cargo update --package openssl-sys --precise 0.9.46
From 50b70acc4196f201521ecdd28888fe6ff51a7211 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 15 Jun 2019 16:35:53 +0200
Subject: [PATCH 2/2] build-helper/rust: add variables for sodium-sys
---
common/build-helper/rust.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 04838bed2b7..014d0e6e225 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -33,3 +33,7 @@ export GETTEXT_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
# libssh2-sys
export LIBSSH2_SYS_USE_PKG_CONFIG=1
+
+# sodium-sys
+export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include"
+export SODIUM_INC_DIR="${XBPS_CROSS_BASE}/usr/lib"
next prev parent reply other threads:[~2019-06-15 14:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-15 11:38 [PR PATCH] " voidlinux-github
2019-06-15 14:37 ` voidlinux-github [this message]
2019-06-15 14:37 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
2019-06-16 19:40 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190615143730.RrGG-zRMKso0csrPO1vx3HRFmtRjEvPu4eBD7EanECo@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).