Attachment #168368 for bug #208120

Lines 1-7 Link Here

(-)cmake-modules/Makefile (-1 / +1 lines)
1	# Created by: gahr	1	# Created by: gahr
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 0	4	PORTREVISION= 1
5	PKGNAMESUFFIX= -modules	5	PKGNAMESUFFIX= -modules
6		6
7	COMMENT= Modules and Templates for CMake	7	COMMENT= Modules and Templates for CMake




--- Modules/CMakeFortranInformation.cmake.orig	2016-01-19 16:09:06 UTC
+++ Modules/CMakeFortranInformation.cmake
@@ -44,6 +44,9 @@ if (NOT _INCLUDED_FILE)
   include(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
 endif ()
 
+if(CMAKE_Fortran_RPATH)
+  set(CMAKE_INSTALL_RPATH ${CMAKE_Fortran_RPATH};${CMAKE_INSTALL_RPATH})
+endif()
 if(CMAKE_Fortran_SIZEOF_DATA_PTR)
   foreach(f ${CMAKE_Fortran_ABI_FILES})
     include(${f})




--- Modules/Compiler/GNU-Fortran.cmake.orig	2016-03-18 02:08:11 UTC
+++ Modules/Compiler/GNU-Fortran.cmake
@@ -13,3 +13,13 @@ unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
 
 # Fortran-specific feature flags.
 set(CMAKE_Fortran_MODDIR_FLAG -J)
+
+# Find out where gfortran thinks that libgcc_s should come from.
+execute_process(COMMAND ${CMAKE_Fortran_COMPILER} -print-file-name=libgcc_s.so
+	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+	OUTPUT_VARIABLE _D1)
+
+# Map that to a sensible directory.
+get_filename_component(_D2 ${_D1} DIRECTORY)
+get_filename_component(_D3 ${_D2} ABSOLUTE)
+set(CMAKE_Fortran_RPATH ${_D3})

Return to bug 208120

Line 0 Link Here

(-)cmake-modules/files/patch-Modules_CMakeFortranInformation.cmake (+12 lines)
	1	--- Modules/CMakeFortranInformation.cmake.orig 2016-01-19 16:09:06 UTC
	2	+++ Modules/CMakeFortranInformation.cmake
	3	@@ -44,6 +44,9 @@ if (NOT _INCLUDED_FILE)
	4	include(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL)
	5	endif ()
	6
	7	+if(CMAKE_Fortran_RPATH)
	8	+ set(CMAKE_INSTALL_RPATH ${CMAKE_Fortran_RPATH};${CMAKE_INSTALL_RPATH})
	9	+endif()
	10	if(CMAKE_Fortran_SIZEOF_DATA_PTR)
	11	foreach(f ${CMAKE_Fortran_ABI_FILES})
	12	include(${f})

Line 0 Link Here

(-)cmake-modules/files/patch-Modules_Compiler_GNU-Fortran.cmake (+16 lines)
	1	--- Modules/Compiler/GNU-Fortran.cmake.orig 2016-03-18 02:08:11 UTC
	2	+++ Modules/Compiler/GNU-Fortran.cmake
	3	@@ -13,3 +13,13 @@ unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
	4
	5	# Fortran-specific feature flags.
	6	set(CMAKE_Fortran_MODDIR_FLAG -J)
	7	+
	8	+# Find out where gfortran thinks that libgcc_s should come from.
	9	+execute_process(COMMAND ${CMAKE_Fortran_COMPILER} -print-file-name=libgcc_s.so
	10	+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	11	+ OUTPUT_VARIABLE _D1)
	12	+
	13	+# Map that to a sensible directory.
	14	+get_filename_component(_D2 ${_D1} DIRECTORY)
	15	+get_filename_component(_D3 ${_D2} ABSOLUTE)
	16	+set(CMAKE_Fortran_RPATH ${_D3})