-
Notifications
You must be signed in to change notification settings - Fork 550
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Include all sources in bond regardless of arch (#280)
- Loading branch information
1 parent
41a0fa6
commit 7180b15
Showing
2 changed files
with
22 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "Signatures": { | ||
| "bond-8.0.1.tar.gz" : "d22428a40ab158813c6b0d6548a9a4c1304c1873bd4f2f62a0f36c0ba2855a8b", | ||
| "gbc-0.11.0.3-aarch64" : "2fa232b3ceb79ff2e002ad06f8da93bd59f81599102f95258b4dadb84d6b847d", | ||
| "gbc-0.11.0.3-x86_64" : "c64f9db841b8cccad4c8ec0bd724e52d28b51a15af145fe40223cd92d7356d71" | ||
| } | ||
| } | ||
| "Signatures": { | ||
| "bond-8.0.1.tar.gz": "d22428a40ab158813c6b0d6548a9a4c1304c1873bd4f2f62a0f36c0ba2855a8b", | ||
| "gbc-0.11.0.3-aarch64": "2fa232b3ceb79ff2e002ad06f8da93bd59f81599102f95258b4dadb84d6b847d", | ||
| "gbc-0.11.0.3-x86_64": "c64f9db841b8cccad4c8ec0bd724e52d28b51a15af145fe40223cd92d7356d71" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| Name: bond | ||
| Summary: Microsoft Bond Library | ||
| Name: bond | ||
| Version: 8.0.1 | ||
| Release: 3%{?dist} | ||
| Release: 4%{?dist} | ||
| License: MIT | ||
| Vendor: Microsoft Corporation | ||
| Distribution: Mariner | ||
| URL: https://github.com/microsoft/bond | ||
| #Source0: %{url}/archive/%{version}.tar.gz | ||
| Source0: %{name}-%{version}.tar.gz | ||
| Source1: gbc-0.11.0.3-%{_arch} | ||
|
|
||
| Source1: gbc-0.11.0.3-aarch64 | ||
| Source2: gbc-0.11.0.3-x86_64 | ||
| BuildRequires: boost-devel | ||
| BuildRequires: clang | ||
| BuildRequires: cmake | ||
| BuildRequires: zlib-devel | ||
| BuildRequires: boost-devel | ||
| BuildRequires: gmp-devel | ||
| BuildRequires: ncurses-devel | ||
| BuildRequires: rapidjson-devel | ||
| BuildRequires: gmp-devel | ||
| BuildRequires: zlib-devel | ||
|
|
||
| %description | ||
| Bond is an open-source, cross-platform framework for working with schematized data. | ||
|
|
@@ -39,7 +39,11 @@ CMAKE_OPTS="\ | |
| -DBOND_FIND_RAPIDJSON=TRUE \ | ||
| -DBOND_SKIP_CORE_TESTS=TRUE \ | ||
| -DBOND_SKIP_GBC_TESTS=TRUE \ | ||
| %ifarch aarch64 | ||
| -DBOND_GBC_PATH=%{SOURCE1} \ | ||
| %else | ||
| -DBOND_GBC_PATH=%{SOURCE2} \ | ||
| %endif | ||
| -DCMAKE_INSTALL_PREFIX=%{_prefix} \ | ||
| " | ||
|
|
||
|
|
@@ -63,11 +67,16 @@ chmod 0755 %{buildroot}%{_bindir}/gbc | |
| %{_libdir}/%{name}/* | ||
|
|
||
| %changelog | ||
| * Tue Oct 27 2020 Joe Schmitt <[email protected]> - 8.0.1-4 | ||
| - Include all sources regardless of architecture. | ||
|
|
||
| * Mon Oct 19 2020 Pawel Winogrodzki <[email protected]> 8.0.1-3 | ||
| - License verified. | ||
| - Added source URL. | ||
| - Added 'Vendor' and 'Distribution' tags. | ||
|
|
||
| * Tue May 19 2020 Jonathan Chiu <[email protected]> 8.0.1-2 | ||
| - Add aarch64 support | ||
|
|
||
| * Mon Apr 06 2020 Jonathan Chiu <[email protected]> 8.0.1-1 | ||
| - Original version for CBL-Mariner. | ||