rpms/rpm-ostree
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Two fixes for non-bundled build

Browse Source 
In the non-bundled case:

 - Don't exclude requires on libhif
 - Don't inject an RPATH
This commit is contained in:
Colin Walters 2016-05-27 11:59:11 -04:00
parent 2f39d383bb
commit 4fdad76c5b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpm-ostree.spec
View File

@ -37,6 +37,9 @@ BuildRequires: libattr-devel
BuildRequires: pkgconfig(librepo)
%if %{with bundled_libhif}
# We're using RPATH to pick up our bundled version
%global __requires_exclude ^libhif[.]so[.].*$
BuildRequires: cmake
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(check)
@ -58,9 +61,6 @@ Requires: ostree >= 2014.6
Provides: rpm-ostree-client
%endif
# We're using RPATH to pick up our bundled version
%global __requires_exclude ^libhif[.]so[.].*$
%description
This tool binds together the world of RPM packages with the OSTree
model of bootable filesystem trees. It provides commands usable both
@ -105,7 +105,12 @@ export PKG_CONFIG_PATH=$(pwd)/libhif/libhif${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
export LD_LIBRARY_PATH=$(pwd)/libhif/libhif${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
%endif
env NOCONFIGURE=1 ./autogen.sh
%configure --disable-silent-rules --enable-gtk-doc LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
%configure --disable-silent-rules --enable-gtk-doc \
%if %{with bundled_libhif}
LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
%else
%endif
make %{?_smp_mflags}
%install