[113983] trunk/dports/science/htcondor

[aronnax at macports.org]

Revision: 113983
          https://trac.macports.org/changeset/113983
Author:   aronnax at macports.org
Date:     2013-11-26 16:56:41 -0800 (Tue, 26 Nov 2013)
Log Message:
-----------
htcondor: de-scope patch per suggestion of upstream developer

Modified Paths:
--------------
    trunk/dports/science/htcondor/Portfile
    trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff

Modified: trunk/dports/science/htcondor/Portfile
===================================================================
--- trunk/dports/science/htcondor/Portfile	2013-11-27 00:54:18 UTC (rev 113982)
+++ trunk/dports/science/htcondor/Portfile	2013-11-27 00:56:41 UTC (rev 113983)
@@ -10,7 +10,7 @@
 github.setup            htcondor htcondor 8_1_1 V
 version                 [strsed ${github.version} g/_/\./]
 maintainers             aronnax
-revision                1
+revision                2
 
 categories              science parallel net
 license                 apache

Modified: trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff	2013-11-27 00:54:18 UTC (rev 113982)
+++ trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff	2013-11-27 00:56:41 UTC (rev 113983)
@@ -1,32 +1,17 @@
---- build/cmake/CondorConfigure.cmake.orig	2013-10-27 19:39:00.000000000 -0700
-+++ build/cmake/CondorConfigure.cmake	2013-10-27 19:40:24.000000000 -0700
-@@ -270,15 +270,6 @@
- 	check_cxx_compiler_flag(-std=c++11 cxx_11)
- 	if (cxx_11)
- 
--		# Clang requires some additional C++11 flags, as the default stdlib
--		# is from an old GCC version.
--		if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+--- build/cmake/CondorConfigure.cmake.orig	2013-11-26 16:39:01.000000000 -0800
++++ build/cmake/CondorConfigure.cmake	2013-11-26 16:41:44.000000000 -0800
+@@ -273,10 +273,10 @@
+ 		# Clang requires some additional C++11 flags, as the default stdlib
+ 		# is from an old GCC version.
+ 		if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
 -			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -lc++")
 -			set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lc++")
 -			set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lc++")
 -			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++")
--		endif()
--
- 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
++			set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
++			set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}")
++			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+ 		endif()
  
- 		check_cxx_source_compiles("
-@@ -291,13 +282,6 @@
- 		}
- 		" PREFER_CPP11 )
- 
--		# Note - without adding -lc++ to the CXX flags, the linking of the test
--		# above will fail for clang.  It doesn't seem strictly necessary though,
--		# so we remove this afterward.
--		if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
--			string(REPLACE "-lc++" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
--		endif()
--
- 	endif (cxx_11)
- 
- 	if (NOT PREFER_CPP11)
+ 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131126/2a382e0e/attachment-0001.html>