* [PR PATCH] pijul: fix build
@ 2019-06-15 10:54 voidlinux-github
2019-06-15 10:57 ` [PR PATCH] [Updated] " voidlinux-github
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-15 10:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
There is a new pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages pijul
https://github.com/void-linux/void-packages/pull/12467
pijul: fix build
A patch file from https://github.com/void-linux/void-packages/pull/12467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pijul-12467.patch --]
[-- Type: application/text/x-diff, Size: 2135 bytes --]
From ae184bf58589a5403044fb10cfc85db8a520730c Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 15 Jun 2019 12:49:00 +0200
Subject: [PATCH] pijul: fix build
---
srcpkgs/pijul/patches/bindgen.patch | 9 +++++++++
srcpkgs/pijul/template | 11 +++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/pijul/patches/bindgen.patch
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
new file mode 100644
index 00000000000..2b303f42dec
--- /dev/null
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -0,0 +1,9 @@
+patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
+
+--- Cargo.toml.orig 2019-06-15 02:33:02.105715462 +0200
++++ Cargo.toml 2019-06-15 02:36:33.905701785 +0200
+@@ -6,3 +6,4 @@
+ "libpijul:0.12.0" = { path = "libpijul" }
+ "line:0.1.15" = { path = "line" }
+ "diffs:0.3.0" = { path = "diffs" }
++"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 29a70927713..c6d235be02f 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -3,7 +3,7 @@ pkgname=pijul
version=0.12.0
revision=1
build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config clang"
makedepends="libsodium-devel libressl-devel nettle-devel"
short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -12,7 +12,14 @@ homepage="https://pijul.org/"
distfiles="https://pijul.org/releases/pijul-${version}.tar.gz"
checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6
-broken="Links clang to build. Can't build on arm* with clang."
+export HOST_CC="$BUILD_CC"
+export HOST_CFLAGS="$BUILD_CFLAGS"
+export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
+
+pre_build() {
+ cargo update --package openssl-sys --precise 0.9.46
+ cargo update --package openssl --precise 0.10.22
+}
# We only want to install the binary, so don't run cargo install
do_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] pijul: fix build
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
@ 2019-06-15 10:57 ` voidlinux-github
2019-06-15 10:57 ` voidlinux-github
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-15 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages pijul
https://github.com/void-linux/void-packages/pull/12467
pijul: fix build
A patch file from https://github.com/void-linux/void-packages/pull/12467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pijul-12467.patch --]
[-- Type: application/text/x-diff, Size: 2179 bytes --]
From 46751ec503b1acdd4781b56460f3a55ae8f39d23 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 15 Jun 2019 12:49:00 +0200
Subject: [PATCH] pijul: fix build
---
srcpkgs/pijul/patches/bindgen.patch | 9 +++++++++
srcpkgs/pijul/template | 13 ++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pijul/patches/bindgen.patch
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
new file mode 100644
index 00000000000..2b303f42dec
--- /dev/null
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -0,0 +1,9 @@
+patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
+
+--- Cargo.toml.orig 2019-06-15 02:33:02.105715462 +0200
++++ Cargo.toml 2019-06-15 02:36:33.905701785 +0200
+@@ -6,3 +6,4 @@
+ "libpijul:0.12.0" = { path = "libpijul" }
+ "line:0.1.15" = { path = "line" }
+ "diffs:0.3.0" = { path = "diffs" }
++"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 29a70927713..87e51ed1885 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,9 +1,9 @@
# Template file for 'pijul'
pkgname=pijul
version=0.12.0
-revision=1
+revision=2
build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config clang"
makedepends="libsodium-devel libressl-devel nettle-devel"
short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -12,7 +12,14 @@ homepage="https://pijul.org/"
distfiles="https://pijul.org/releases/pijul-${version}.tar.gz"
checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6
-broken="Links clang to build. Can't build on arm* with clang."
+export HOST_CC="$BUILD_CC"
+export HOST_CFLAGS="$BUILD_CFLAGS"
+export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
+
+pre_build() {
+ cargo update --package openssl-sys --precise 0.9.46
+ cargo update --package openssl --precise 0.10.22
+}
# We only want to install the binary, so don't run cargo install
do_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] pijul: fix build
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
2019-06-15 10:57 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-15 10:57 ` voidlinux-github
2019-06-15 11:38 ` voidlinux-github
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-15 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages pijul
https://github.com/void-linux/void-packages/pull/12467
pijul: fix build
A patch file from https://github.com/void-linux/void-packages/pull/12467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pijul-12467.patch --]
[-- Type: application/text/x-diff, Size: 2179 bytes --]
From 46751ec503b1acdd4781b56460f3a55ae8f39d23 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 15 Jun 2019 12:49:00 +0200
Subject: [PATCH] pijul: fix build
---
srcpkgs/pijul/patches/bindgen.patch | 9 +++++++++
srcpkgs/pijul/template | 13 ++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pijul/patches/bindgen.patch
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
new file mode 100644
index 00000000000..2b303f42dec
--- /dev/null
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -0,0 +1,9 @@
+patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
+
+--- Cargo.toml.orig 2019-06-15 02:33:02.105715462 +0200
++++ Cargo.toml 2019-06-15 02:36:33.905701785 +0200
+@@ -6,3 +6,4 @@
+ "libpijul:0.12.0" = { path = "libpijul" }
+ "line:0.1.15" = { path = "line" }
+ "diffs:0.3.0" = { path = "diffs" }
++"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 29a70927713..87e51ed1885 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,9 +1,9 @@
# Template file for 'pijul'
pkgname=pijul
version=0.12.0
-revision=1
+revision=2
build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config clang"
makedepends="libsodium-devel libressl-devel nettle-devel"
short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -12,7 +12,14 @@ homepage="https://pijul.org/"
distfiles="https://pijul.org/releases/pijul-${version}.tar.gz"
checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6
-broken="Links clang to build. Can't build on arm* with clang."
+export HOST_CC="$BUILD_CC"
+export HOST_CFLAGS="$BUILD_CFLAGS"
+export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
+
+pre_build() {
+ cargo update --package openssl-sys --precise 0.9.46
+ cargo update --package openssl --precise 0.10.22
+}
# We only want to install the binary, so don't run cargo install
do_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] pijul: fix build
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
` (2 preceding siblings ...)
2019-06-15 11:38 ` voidlinux-github
@ 2019-06-15 11:38 ` voidlinux-github
2019-06-15 13:09 ` [WIP] " voidlinux-github
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-15 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages pijul
https://github.com/void-linux/void-packages/pull/12467
pijul: fix build
A patch file from https://github.com/void-linux/void-packages/pull/12467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pijul-12467.patch --]
[-- Type: application/text/x-diff, Size: 2280 bytes --]
From d0ca58f781baf87e9f496e434e5721e521469411 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 15 Jun 2019 12:49:00 +0200
Subject: [PATCH] pijul: fix build
---
srcpkgs/pijul/patches/bindgen.patch | 10 ++++++++++
srcpkgs/pijul/template | 15 ++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pijul/patches/bindgen.patch
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
new file mode 100644
index 00000000000..dd124b79c2f
--- /dev/null
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -0,0 +1,10 @@
+patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
+https://github.com/jnbr/rust-bindgen/tree/0.43.2-clang_args
+
+--- Cargo.toml.orig 2019-06-15 02:33:02.105715462 +0200
++++ Cargo.toml 2019-06-15 02:36:33.905701785 +0200
+@@ -6,3 +6,4 @@
+ "libpijul:0.12.0" = { path = "libpijul" }
+ "line:0.1.15" = { path = "line" }
+ "diffs:0.3.0" = { path = "diffs" }
++"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 29a70927713..b76bd1d3f4c 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,9 +1,9 @@
# Template file for 'pijul'
pkgname=pijul
version=0.12.0
-revision=1
+revision=2
build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config clang"
makedepends="libsodium-devel libressl-devel nettle-devel"
short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -12,7 +12,16 @@ homepage="https://pijul.org/"
distfiles="https://pijul.org/releases/pijul-${version}.tar.gz"
checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6
-broken="Links clang to build. Can't build on arm* with clang."
+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
+ cargo update --package openssl --precise 0.10.22
+}
# We only want to install the binary, so don't run cargo install
do_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] pijul: fix build
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
2019-06-15 10:57 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-15 10:57 ` voidlinux-github
@ 2019-06-15 11:38 ` voidlinux-github
2019-06-15 11:38 ` voidlinux-github
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-15 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 298 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages pijul
https://github.com/void-linux/void-packages/pull/12467
pijul: fix build
A patch file from https://github.com/void-linux/void-packages/pull/12467.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pijul-12467.patch --]
[-- Type: application/text/x-diff, Size: 2280 bytes --]
From d0ca58f781baf87e9f496e434e5721e521469411 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Sat, 15 Jun 2019 12:49:00 +0200
Subject: [PATCH] pijul: fix build
---
srcpkgs/pijul/patches/bindgen.patch | 10 ++++++++++
srcpkgs/pijul/template | 15 ++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pijul/patches/bindgen.patch
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
new file mode 100644
index 00000000000..dd124b79c2f
--- /dev/null
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -0,0 +1,10 @@
+patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
+https://github.com/jnbr/rust-bindgen/tree/0.43.2-clang_args
+
+--- Cargo.toml.orig 2019-06-15 02:33:02.105715462 +0200
++++ Cargo.toml 2019-06-15 02:36:33.905701785 +0200
+@@ -6,3 +6,4 @@
+ "libpijul:0.12.0" = { path = "libpijul" }
+ "line:0.1.15" = { path = "line" }
+ "diffs:0.3.0" = { path = "diffs" }
++"bindgen:0.43.2" = {git = 'https://github.com/jnbr/rust-bindgen', rev = "1467ac97c669c1ddda8117ccf1d398609b0e6fa9"}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 29a70927713..b76bd1d3f4c 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,9 +1,9 @@
# Template file for 'pijul'
pkgname=pijul
version=0.12.0
-revision=1
+revision=2
build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config clang"
makedepends="libsodium-devel libressl-devel nettle-devel"
short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -12,7 +12,16 @@ homepage="https://pijul.org/"
distfiles="https://pijul.org/releases/pijul-${version}.tar.gz"
checksum=987820fa2a6fe92a9f516f5e9b41ad59a597973e72cb0c7a44ca0f38e741a7e6
-broken="Links clang to build. Can't build on arm* with clang."
+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
+ cargo update --package openssl --precise 0.10.22
+}
# We only want to install the binary, so don't run cargo install
do_install() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [WIP] pijul: fix build
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
` (3 preceding siblings ...)
2019-06-15 11:38 ` voidlinux-github
@ 2019-06-15 13:09 ` voidlinux-github
2019-06-15 14:39 ` voidlinux-github
2019-06-16 11:55 ` [PR PATCH] [Merged]: " voidlinux-github
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-15 13:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/12467#issuecomment-502365624
Comment:
it builds but it probably still uses some of the host headers
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: pijul: fix build
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
` (4 preceding siblings ...)
2019-06-15 13:09 ` [WIP] " voidlinux-github
@ 2019-06-15 14:39 ` voidlinux-github
2019-06-16 11:55 ` [PR PATCH] [Merged]: " voidlinux-github
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-15 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/12467#issuecomment-502372167
Comment:
should be fine
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: pijul: fix build
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
` (5 preceding siblings ...)
2019-06-15 14:39 ` voidlinux-github
@ 2019-06-16 11:55 ` voidlinux-github
6 siblings, 0 replies; 8+ messages in thread
From: voidlinux-github @ 2019-06-16 11:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
There's a merged pull request on the void-packages repository
pijul: fix build
https://github.com/void-linux/void-packages/pull/12467
Description:
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-06-16 11:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-15 10:54 [PR PATCH] pijul: fix build voidlinux-github
2019-06-15 10:57 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-15 10:57 ` voidlinux-github
2019-06-15 11:38 ` voidlinux-github
2019-06-15 11:38 ` voidlinux-github
2019-06-15 13:09 ` [WIP] " voidlinux-github
2019-06-15 14:39 ` voidlinux-github
2019-06-16 11:55 ` [PR PATCH] [Merged]: " voidlinux-github
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).