diff options
| author | db <db@FreeBSD.org> | 2016-06-04 04:10:02 +0800 |
|---|---|---|
| committer | db <db@FreeBSD.org> | 2016-06-04 04:10:02 +0800 |
| commit | de647b9415877e06fde1fb8487fe31baf0d07a5f (patch) | |
| tree | 93924cd120f616605a88d13cf712360c127253b9 /comms | |
| parent | a66c40371b18673fb043fb39f955738bdfe96c6d (diff) | |
| download | freebsd-ports-gnome-de647b9415877e06fde1fb8487fe31baf0d07a5f.tar.gz freebsd-ports-gnome-de647b9415877e06fde1fb8487fe31baf0d07a5f.tar.zst freebsd-ports-gnome-de647b9415877e06fde1fb8487fe31baf0d07a5f.zip | |
Cleanup a bit by passing necessary CMAKE_INSTALL_RPATH in Makefile
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/sdr-wspr/Makefile | 1 | ||||
| -rw-r--r-- | comms/sdr-wspr/files/patch-CMakeLists.txt | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile index 4b0c6bf6d694..e7888c52e845 100644 --- a/comms/sdr-wspr/Makefile +++ b/comms/sdr-wspr/Makefile @@ -20,5 +20,6 @@ USES= cmake:outsource compiler:gcc-c++11-lib fortran pkgconfig PLIST_FILES= bin/sdr-wspr share/applications/sdr-wspr.desktop \ share/icons/sdr-wspr.svg +CMAKE_ARGS= -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" .include <bsd.port.mk> diff --git a/comms/sdr-wspr/files/patch-CMakeLists.txt b/comms/sdr-wspr/files/patch-CMakeLists.txt index 95be4c37ef62..bf3f5275184f 100644 --- a/comms/sdr-wspr/files/patch-CMakeLists.txt +++ b/comms/sdr-wspr/files/patch-CMakeLists.txt @@ -1,18 +1,6 @@ --- CMakeLists.txt.orig 2015-04-21 14:32:18 UTC +++ CMakeLists.txt -@@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 2.8.8) - project(sdr-wspr) - # required for original wspr code - enable_language(Fortran) -+# temporary ugly hack -+string(REGEX MATCH "-rpath=.*" CMAKE_RPATH_ARG ${CMAKE_Fortran_FLAGS} ) -+string(SUBSTRING ${CMAKE_RPATH_ARG} 7 -1 CMAKE_RPATH) -+set(CMAKE_INSTALL_RPATH ${CMAKE_RPATH} ) -+message(STATUS CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}) - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake) - include(InstallHeadersWithDirectory) -@@ -63,34 +68,6 @@ ELSE(NOT LIBSDR_GUI_FOUND) +@@ -63,34 +63,6 @@ ELSE(NOT LIBSDR_GUI_FOUND) ENDIF(NOT LIBSDR_GUI_FOUND) # Set compiler flags |