Fix build with recent ASIO and automake (#1817658)
Since automake is now newer than the version used to produce the tarball, our patch that touches gi-overrides/Makefile.am causes the build to fail - we need to run aclocal and automake to fix this. To fix the ASIO-related build failure reported as #1817658 we have to build with `-DASIO_ENABLE_BOOST` - asio now uses standalone mode automatically when C++11 or later is detected, but it seems abiword can't build this way. See https://github.com/chriskohlhoff/asio/commit/265e75cd and https://github.com/openscenegraph/OpenSceneGraph/issues/921 for more on that.
This commit is contained in:
parent
38cd4bc71a
commit
f6c4fa0dec
@ -25,6 +25,8 @@ Patch5: abiword-3.0.4-pygobject.patch
|
||||
BuildRequires: aiksaurus-devel
|
||||
BuildRequires: aiksaurus-gtk-devel
|
||||
BuildRequires: asio-devel
|
||||
# Needed while explicit-python.patch touches gi-overrides/Makefile.am
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: bzip2-devel
|
||||
@ -116,8 +118,12 @@ find . -type d -exec chmod -c o+rx {} \;
|
||||
popd
|
||||
|
||||
%build
|
||||
%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
|
||||
# Needed while explicit-python.patch touches gi-overrides/Makefile.am
|
||||
aclocal
|
||||
automake
|
||||
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -DASIO_ENABLE_BOOST"
|
||||
%configure --enable-plugins --enable-clipart --enable-templates --enable-introspection
|
||||
%{make_build} V=1
|
||||
|
||||
# build the documentation
|
||||
|
Loading…
Reference in New Issue
Block a user