Date: Fri, 3 Jun 2016 20:10:02 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416336 - in head/comms/sdr-wspr: . files Message-ID: <201606032010.u53KA2lP079411@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Fri Jun 3 20:10:02 2016 New Revision: 416336 URL: https://svnweb.freebsd.org/changeset/ports/416336 Log: Cleanup a bit by passing necessary CMAKE_INSTALL_RPATH in Makefile Modified: head/comms/sdr-wspr/Makefile head/comms/sdr-wspr/files/patch-CMakeLists.txt (contents, props changed) Modified: head/comms/sdr-wspr/Makefile ============================================================================== --- head/comms/sdr-wspr/Makefile Fri Jun 3 19:37:15 2016 (r416335) +++ head/comms/sdr-wspr/Makefile Fri Jun 3 20:10:02 2016 (r416336) @@ -20,5 +20,6 @@ USES= cmake:outsource compiler:gcc-c++1 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> Modified: head/comms/sdr-wspr/files/patch-CMakeLists.txt ============================================================================== --- head/comms/sdr-wspr/files/patch-CMakeLists.txt Fri Jun 3 19:37:15 2016 (r416335) +++ head/comms/sdr-wspr/files/patch-CMakeLists.txt Fri Jun 3 20:10:02 2016 (r416336) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606032010.u53KA2lP079411>