diff options
| author |   Zero_Chaos <zerochaos@gentoo.org> | 2015-10-05 13:55:42 -0400 |
|---|---|---|
| committer | Zero_Chaos <zerochaos@gentoo.org> | 2015-10-05 13:56:16 -0400 |
| commit | a269a7d862be9f4bfe5fc0d8201d889a1a656455 (patch) | |
| tree | d30b697e044572498b9f55eaa5d7e4938b1cfd34 /net-wireless | |
| parent | app-crypt/xca: version bump (diff) | |
| download | gentoo-a269a7d862be9f4bfe5fc0d8201d889a1a656455.tar.gz gentoo-a269a7d862be9f4bfe5fc0d8201d889a1a656455.tar.bz2 gentoo-a269a7d862be9f4bfe5fc0d8201d889a1a656455.zip | |
net-wireless/inspectrum: backport fix for bug #562164 from upstream
Package-Manager: portage-2.2.22
Diffstat (limited to 'net-wireless')
| -rw-r--r-- | net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch | 28 | ||||
| -rw-r--r-- | net-wireless/inspectrum/inspectrum-0.1-r1.ebuild (renamed from net-wireless/inspectrum/inspectrum-0.1.ebuild) | 7 |
2 files changed, 34 insertions, 1 deletions
diff --git a/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch b/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch new file mode 100644 index 000000000000..b7b35a975aef --- /dev/null +++ b/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch @@ -0,0 +1,28 @@ +From 6287ae4153231865c9d3cafaf8c80d488b8ba84e Mon Sep 17 00:00:00 2001 +From: Mike Walters <mike@flomp.net> +Date: Mon, 5 Oct 2015 18:29:37 +0100 +Subject: [PATCH] Set default CXXFLAGS if none are set + +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47e8faa..b788a24 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,9 +15,13 @@ if (WIN32) + endif(NOT(MMAN)) + ENDIF (WIN32) + ++if (NOT CMAKE_CXX_FLAGS) ++ set(CMAKE_CXX_FLAGS "-O2") ++endif (NOT CMAKE_CXX_FLAGS) ++ + # This only works in cmake >3.1 + #set_property(TARGET inspectrum PROPERTY CXX_STANDARD 11) +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -O3") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") + + list(APPEND inspectrum_sources + main.cpp diff --git a/net-wireless/inspectrum/inspectrum-0.1.ebuild b/net-wireless/inspectrum/inspectrum-0.1-r1.ebuild index 9d93c6238b06..e8001cfb5e16 100644 --- a/net-wireless/inspectrum/inspectrum-0.1.ebuild +++ b/net-wireless/inspectrum/inspectrum-0.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-utils +inherit cmake-utils eutils DESCRIPTION="a tool for analysing captured signals, primarily from software-defined radio receivers" HOMEPAGE="https://github.com/miek/inspectrum" @@ -27,3 +27,8 @@ RDEPEND="sci-libs/fftw:3.0= dev-qt/qtcore:5" DEPEND="virtual/pkgconfig ${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-cxxflags.patch + cmake-utils_src_prepare +} |