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

build: Make libhif bundling an option

Browse Source 
For rpmdistro-gitoverlay, it's more convenient to just do libhif as a
system wide thing.
This commit is contained in:
Colin Walters 2016-05-24 14:53:08 -04:00
parent 5738f10432
commit 8a57b061b9
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpm-ostree.spec
View File

@ -1,3 +1,4 @@
%bcond_without bundled_libhif
Summary: Client side upgrade program and server side compose tool Summary: Client side upgrade program and server side compose tool
Name: rpm-ostree Name: rpm-ostree
Version: 2016.3 Version: 2016.3
@ -10,8 +11,10 @@ Source0: rpm-ostree-%{version}.tar.xz
# avoid being version locked with PackageKit/dnf right now. # avoid being version locked with PackageKit/dnf right now.
# This source is generated via # This source is generated via
# git archive --format=tar --prefix=libhif/ # git archive --format=tar --prefix=libhif/
%if %{with bundled_libhif}
Source1: libhif.tar.gz Source1: libhif.tar.gz
Provides: bundled(libhif) = 0.7.0 Provides: bundled(libhif) = 0.7.0
%endif
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/projectatomic/rpm-ostree URL: https://github.com/projectatomic/rpm-ostree
# We always run autogen.sh # We always run autogen.sh
@ -28,6 +31,10 @@ BuildRequires: pkgconfig(libgsystem)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(rpm) BuildRequires: pkgconfig(rpm)
BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libarchive)
%if %{with bundled_libhif}
%else
BuildRequires: pkgconfig(libhif)
%endif
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
# libhif deps # libhif deps
@ -67,9 +74,12 @@ The %{name}-devel package includes the header files for the %{name} library.
%prep %prep
%autosetup -Sgit -n %{name}-%{version} %autosetup -Sgit -n %{name}-%{version}
%if %{with bundled_libhif}
tar xf %{SOURCE1} tar xf %{SOURCE1}
%endif
%build %build
%if %{with bundled_libhif}
(cd libhif (cd libhif
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX:PATH=%{_libexecdir}/rpm-ostree \ -DCMAKE_INSTALL_PREFIX:PATH=%{_libexecdir}/rpm-ostree \
@ -91,11 +101,13 @@ EOF
) )
export PKG_CONFIG_PATH=$(pwd)/libhif/libhif${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} 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} export LD_LIBRARY_PATH=$(pwd)/libhif/libhif${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
%endif
env NOCONFIGURE=1 ./autogen.sh 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 LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%if %{with bundled_libhif}
(cd libhif (cd libhif
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
for path in %{_libdir}/python2.7 %{_libexecdir}/rpm-ostree/include %{_libexecdir}/rpm-ostree/pkg-config \ for path in %{_libdir}/python2.7 %{_libexecdir}/rpm-ostree/include %{_libexecdir}/rpm-ostree/pkg-config \
@ -108,6 +120,7 @@ make %{?_smp_mflags}
# and nuke everything else. # and nuke everything else.
rm $RPM_BUILD_ROOT/%{_libexecdir}/rpm-ostree -rf rm $RPM_BUILD_ROOT/%{_libexecdir}/rpm-ostree -rf
) )
%endif
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
find $RPM_BUILD_ROOT -name '*.la' -delete find $RPM_BUILD_ROOT -name '*.la' -delete