pool/fmt
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 688362 from home:olh:branches:devel:libraries:c_c++

Browse Source 
- Install fmt.pc into libdir with
  0001-install-pkg-config-file-into-libdir.patch

OBS-URL: https://build.opensuse.org/request/show/688362
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/fmt?expand=0&rev=7
This commit is contained in:
Luigi Baldoni 2019-03-26 08:29:23 +00:00 committed by Git OBS Bridge
parent 507c50d090
commit d8e42642c2
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-install-pkg-config-file-into-libdir.patch Normal file
View File

@ -0,0 +1,30 @@
From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 25 Mar 2019 17:10:40 +0100
Subject: install pkg-config file into libdir
Most pkgconfig files contain a Libs: variable, which is either /usr/lib
or /usr/lib64. If a 32bit and a 64bit variant of fmt libraries is
installed, the last one wins. As a result compiling for the other
bitsize will fail.
Instead of sharedir use libdir as install target.
Fixes commit 9d0c9c4bb145a286f725cd38c90331eee7addc7f
Fixes commit 287342dab10a5a96479b3e21cd11ce671ed8125c
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ if (FMT_INSTALL)
set(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/fmt CACHE STRING
"Installation directory for include files, relative to ${CMAKE_INSTALL_PREFIX}.")
- set(FMT_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH
+ set(FMT_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE PATH
"Installation directory for pkgconfig (.pc) files, relative to ${CMAKE_INSTALL_PREFIX}.")
# Generate the version, config and target files into the build directory.

6
fmt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 16:21:01 UTC 2019 - olaf@aepfle.de
- Install fmt.pc into libdir with
0001-install-pkg-config-file-into-libdir.patch
-------------------------------------------------------------------
Sat Jan 12 18:29:40 UTC 2019 - Ferdinand Thiessen <rpm@fthiessen.de>

5
fmt.spec
View File

@ -26,6 +26,7 @@ Group: Development/Libraries/C and C++
URL: http://fmtlib.net/
Source0: https://github.com/fmtlib/fmt/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
Patch0: 0001-install-pkg-config-file-into-libdir.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@ -50,7 +51,7 @@ Requires: libfmt%{sover} = %{version}
Development files for fmt, a formatting library for C++.
%prep
%setup -q
%autosetup -p1
%build
%cmake -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir}
@ -81,6 +82,6 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
%{_includedir}/%{name}
%{_libdir}/cmake/%{name}
%{_libdir}/libfmt.so
%{_datadir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/%{name}.pc
%changelog