Remove old Boost workaround and add a new Boost workaround
This commit is contained in:
parent
9f50592a18
commit
2a5cd33f35
|
@ -0,0 +1,25 @@
|
|||
From 9af52328b8ee1aeafbe6b4ad43c3a9cc2cb8be5b Mon Sep 17 00:00:00 2001
|
||||
From: Jamie Nguyen <j@jamielinux.com>
|
||||
Date: Mon, 4 Mar 2019 16:08:09 +0000
|
||||
Subject: [PATCH] Amend sha1.hpp path
|
||||
|
||||
---
|
||||
src/utils.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/utils.h b/src/utils.h
|
||||
index 42ea2ae..70a8ea6 100644
|
||||
--- a/src/utils.h
|
||||
+++ b/src/utils.h
|
||||
@@ -44,7 +44,7 @@
|
||||
#ifndef _UTILS_H
|
||||
#define _UTILS_H
|
||||
|
||||
-#include <boost/uuid/sha1.hpp>
|
||||
+#include <boost/uuid/detail/sha1.hpp>
|
||||
|
||||
/**
|
||||
* @name Default values
|
||||
--
|
||||
2.20.1
|
||||
|
11
ledger.spec
11
ledger.spec
|
@ -10,6 +10,7 @@ Source0: https://github.com/ledger/ledger/archive/v%{version}.tar.gz#/%
|
|||
|
||||
# https://github.com/ledger/ledger/pull/465
|
||||
Patch0: ledger-3.1.1-fix-boost-1.61.patch
|
||||
Patch1: ledger-3.1.1-Amend-sha1.hpp-path.patch
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: boost-python2-devel
|
||||
|
@ -77,13 +78,6 @@ sed -i -e 's#FIXME:UNDOCUMENTED#FIXMEUNDOCUMENTED#g' doc/ledger3.texi
|
|||
|
||||
|
||||
%build
|
||||
# /usr/include/c++/6.1.1/cstdlib:75:25: fatal error: stdlib.h: No such file.
|
||||
# Seems to be related to GCC 6.1, potentially fixed with Boost 1.61.
|
||||
# Hack around this for now.
|
||||
./acprep --prefix=%{_prefix} update || :
|
||||
sed -i -e 's# -isystem /usr/include##g' src/CMakeFiles/libledger.dir/build.make
|
||||
./acprep --prefix=%{_prefix} update
|
||||
|
||||
%cmake . \
|
||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=ON \
|
||||
|
@ -92,9 +86,6 @@ sed -i -e 's# -isystem /usr/include##g' src/CMakeFiles/libledger.dir/build.make
|
|||
-DBUILD_WEB_DOCS:BOOL=ON \
|
||||
-DBUILD_EMACSLISP:BOOL=ON
|
||||
|
||||
sed -i -e 's# -isystem /usr/include##g' src/CMakeFiles/libledger.dir/build.make
|
||||
mkdir system.hh.gch
|
||||
#make %%{?_smp_mflags}
|
||||
make
|
||||
make doc
|
||||
|
||||
|
|
Loading…
Reference in New Issue