Accepting request 841543 from devel:languages:rust
OBS-URL: https://build.opensuse.org/request/show/841543 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cargo-c?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
bae152e346
66
123.patch
Normal file
66
123.patch
Normal file
@ -0,0 +1,66 @@
|
||||
From f3df5af26c9b8a13e2beedb7de688d9b08861513 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Barbato <lu_zero@gentoo.org>
|
||||
Date: Tue, 13 Oct 2020 13:42:02 +0200
|
||||
Subject: [PATCH] Save the include subdir to a specific field
|
||||
|
||||
The pkgconfig generation needs to know the include path w/out the
|
||||
now-optional subdirectory.
|
||||
|
||||
Fixes: #121
|
||||
---
|
||||
src/install.rs | 18 +++++++++++++-----
|
||||
1 file changed, 13 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/install.rs b/src/install.rs
|
||||
index 5105d46..e88be6c 100644
|
||||
--- a/src/install.rs
|
||||
+++ b/src/install.rs
|
||||
@@ -90,7 +90,11 @@ pub fn cinstall(
|
||||
|
||||
let install_path_lib = append_to_destdir(destdir, &paths.libdir);
|
||||
let install_path_pc = append_to_destdir(destdir, &paths.pkgconfigdir);
|
||||
- let install_path_include = append_to_destdir(destdir, &paths.includedir);
|
||||
+ let mut install_path_include = append_to_destdir(destdir, &paths.includedir);
|
||||
+ if let Some(name) = paths.subdir_name {
|
||||
+ install_path_include = install_path_include.join(name);
|
||||
+ }
|
||||
+
|
||||
let install_path_bin = append_to_destdir(destdir, &paths.bindir);
|
||||
|
||||
fs::create_dir_all(&install_path_lib)?;
|
||||
@@ -178,6 +182,7 @@ pub fn cinstall(
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct InstallPaths {
|
||||
+ pub subdir_name: Option<PathBuf>,
|
||||
pub destdir: PathBuf,
|
||||
pub prefix: PathBuf,
|
||||
pub libdir: PathBuf,
|
||||
@@ -200,13 +205,15 @@ impl InstallPaths {
|
||||
.value_of("libdir")
|
||||
.map(PathBuf::from)
|
||||
.unwrap_or_else(|| prefix.join("lib"));
|
||||
- let mut includedir = args
|
||||
+ let includedir = args
|
||||
.value_of("includedir")
|
||||
.map(PathBuf::from)
|
||||
.unwrap_or_else(|| prefix.join("include"));
|
||||
- if capi_config.header.subdirectory {
|
||||
- includedir = includedir.join(name);
|
||||
- }
|
||||
+ let subdir_name = if capi_config.header.subdirectory {
|
||||
+ Some(PathBuf::from(name))
|
||||
+ } else {
|
||||
+ None
|
||||
+ };
|
||||
let bindir = args
|
||||
.value_of("bindir")
|
||||
.map(PathBuf::from)
|
||||
@@ -217,6 +224,7 @@ impl InstallPaths {
|
||||
.unwrap_or_else(|| libdir.join("pkgconfig"));
|
||||
|
||||
InstallPaths {
|
||||
+ subdir_name,
|
||||
destdir,
|
||||
prefix,
|
||||
libdir,
|
||||
3
cargo-c-0.6.13.tar.gz
Normal file
3
cargo-c-0.6.13.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:aa6b23c7ae19ec93e6edeb59be46056faccb915a02d1784a0c29ac7a3c6a8aea
|
||||
size 15472
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:872f5e1eb34e807e57096f5ea20b57c95cc40ab95fe938faa1ca915c68e73cc9
|
||||
size 12860
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 13 11:53:19 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
- Added 123.patch
|
||||
* Save the include subdir to a specific field
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 9 10:33:48 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
- Update to version 0.6.13
|
||||
* https://github.com/lu-zero/cargo-c/releases/tag/v0.6.13
|
||||
* https://github.com/lu-zero/cargo-c/releases/tag/v0.6.12
|
||||
* https://github.com/lu-zero/cargo-c/releases/tag/v0.6.11
|
||||
* https://github.com/lu-zero/cargo-c/releases/tag/v0.6.10
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 13 15:32:40 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
- Update to version 0.6.9
|
||||
* https://github.com/lu-zero/cargo-c/releases/tag/v0.6.9
|
||||
* https://github.com/lu-zero/cargo-c/releases/tag/v0.6.8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 8 06:56:21 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: cargo-c
|
||||
Version: 0.6.7
|
||||
Version: 0.6.13
|
||||
Release: 0
|
||||
Summary: Helper to build and install c-like libraries from Rust
|
||||
License: MIT
|
||||
@ -29,6 +29,8 @@ URL: https://crates.io/crates/cargo-c
|
||||
Source0: https://github.com/lu-zero/cargo-c/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: vendor.tar.xz
|
||||
#
|
||||
Patch0: https://github.com/lu-zero/cargo-c/pull/123.patch
|
||||
#
|
||||
BuildRequires: rust-packaging
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
|
||||
@ -72,7 +74,8 @@ rm -rf %{buildroot}%{_datadir}/cargo/registry
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_bindir}/cargo-cinstall
|
||||
%{_bindir}/cargo-capi
|
||||
%{_bindir}/cargo-cbuild
|
||||
%{_bindir}/cargo-cinstall
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:40de7a82716b0b329c25bd36de97373265aa4e7a5098192de977ad5343480af5
|
||||
size 16131096
|
||||
oid sha256:969d7396c444e0f1eef95a668279b4f71e57a1840259d9a648fd899e07945a10
|
||||
size 17183844
|
||||
|
||||
Loading…
Reference in New Issue
Block a user