forked from pool/backward-cpp
Accepting request 872653 from devel:libraries:c_c++
OBS-URL: https://build.opensuse.org/request/show/872653 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/backward-cpp?expand=0&rev=3
This commit is contained in:
@@ -1,50 +0,0 @@
|
||||
From d4f6779afb1f3278f2e5db9e81c1e8892425edb1 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Rostecki <mrostecki@suse.de>
|
||||
Date: Mon, 22 Oct 2018 16:20:08 +0200
|
||||
Subject: [PATCH] cmake: Use GNUInstallDirs for libdir and includedir
|
||||
|
||||
The comon practice in cmake to allow to specify the libdir or
|
||||
includedir using GNUInstallDirs which introduces the following
|
||||
options:
|
||||
|
||||
* CMAKE_INSTALL_INCLUDEDIR
|
||||
* CMAKE_INSTALL_LIBDIR
|
||||
|
||||
The main motivation behind this change is ability to use /usr/lib64
|
||||
instead of /usr/lib as a libdir.
|
||||
---
|
||||
CMakeLists.txt | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3ab9d6b..7ebda29 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -23,6 +23,12 @@
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
project(backward CXX)
|
||||
|
||||
+# Introduce variables:
|
||||
+# * CMAKE_INSTALL_LIBDIR
|
||||
+# * CMAKE_INSTALL_BINDIR
|
||||
+# * CMAKE_INSTALL_INCLUDEDIR
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
include(BackwardConfig.cmake)
|
||||
|
||||
# check if compiler is nvcc or nvcc_wrapper
|
||||
@@ -125,9 +131,9 @@ endif()
|
||||
|
||||
install(
|
||||
FILES "backward.hpp"
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
)
|
||||
install(
|
||||
FILES "BackwardConfig.cmake"
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/backward
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/backward
|
||||
)
|
||||
--
|
||||
2.19.0
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad73be31c5cfcbffbde7d34dba18158a42043a109e7f41946f0b0abd589ed55e
|
||||
size 189317
|
||||
3
backward-cpp-1.5.tar.gz
Normal file
3
backward-cpp-1.5.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:faf7d4fe7ca65117ed4fe7be9bff9628927bd95b49f71df63d5f99af233d1915
|
||||
size 195528
|
||||
@@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 3 20:39:31 UTC 2021 - Matthias Eliasson <elimat@opensuse.org>
|
||||
|
||||
- Update to version 1.5
|
||||
* BACKWARD_CXX_SOURCE_PREFIXES and many bug fixes
|
||||
- drop patch GNUInstallDirs.patch, fixed upstream
|
||||
- run spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 18 23:15:31 UTC 2019 - Simon Lees <sflees@suse.de>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package backward-cpp-headers
|
||||
# spec file for package backward-cpp
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -12,19 +12,18 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: backward-cpp
|
||||
Version: 1.4
|
||||
Version: 1.5
|
||||
Release: 0
|
||||
Summary: Stack trace printer for C++
|
||||
License: MIT
|
||||
Group: Development/Libraries/C and C++
|
||||
Url: https://github.com/bombela/backward-cpp
|
||||
URL: https://github.com/bombela/backward-cpp
|
||||
Source: https://github.com/bombela/backward-cpp/archive/v%{version}.tar.gz#/backward-cpp-%{version}.tar.gz
|
||||
Patch0: GNUInstallDirs.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
@@ -40,8 +39,7 @@ Group: Development/Libraries/C and C++
|
||||
Development files for backward-cpp, a stack trace printer for C++.
|
||||
|
||||
%prep
|
||||
%setup -q -n backward-cpp-%{version}
|
||||
%patch0 -p1
|
||||
%autosetup -n backward-cpp-%{version}
|
||||
|
||||
%build
|
||||
%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}
|
||||
|
||||
Reference in New Issue
Block a user