Ignore:
Timestamp:
Nov 27, 2013, 12:56:41 AM (6 years ago)
Author:
aronnax@…
Message:

htcondor: de-scope patch per suggestion of upstream developer

Location:
trunk/dports/science/htcondor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/htcondor/Portfile

    r112615 r113983  
    1111version                 [strsed ${github.version} g/_/\./]
    1212maintainers             aronnax
    13 revision                1
     13revision                2
    1414
    1515categories              science parallel net
  • trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff

    r112613 r113983  
    1 --- build/cmake/CondorConfigure.cmake.orig      2013-10-27 19:39:00.000000000 -0700
    2 +++ build/cmake/CondorConfigure.cmake   2013-10-27 19:40:24.000000000 -0700
    3 @@ -270,15 +270,6 @@
    4         check_cxx_compiler_flag(-std=c++11 cxx_11)
    5         if (cxx_11)
    6  
    7 -               # Clang requires some additional C++11 flags, as the default stdlib
    8 -               # is from an old GCC version.
    9 -               if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
     1--- build/cmake/CondorConfigure.cmake.orig      2013-11-26 16:39:01.000000000 -0800
     2+++ build/cmake/CondorConfigure.cmake   2013-11-26 16:41:44.000000000 -0800
     3@@ -273,10 +273,10 @@
     4                # Clang requires some additional C++11 flags, as the default stdlib
     5                # is from an old GCC version.
     6                if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
    107-                       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -lc++")
    118-                       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lc++")
    129-                       set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lc++")
    1310-                       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++")
    14 -               endif()
    15 -
     11+                       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
     12+                       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
     13+                       set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}")
     14+                       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
     15                endif()
     16 
    1617                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
    17  
    18                 check_cxx_source_compiles("
    19 @@ -291,13 +282,6 @@
    20                 }
    21                 " PREFER_CPP11 )
    22  
    23 -               # Note - without adding -lc++ to the CXX flags, the linking of the test
    24 -               # above will fail for clang.  It doesn't seem strictly necessary though,
    25 -               # so we remove this afterward.
    26 -               if ( ${OS_NAME} STREQUAL "DARWIN" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
    27 -                       string(REPLACE "-lc++" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
    28 -               endif()
    29 -
    30         endif (cxx_11)
    31  
    32         if (NOT PREFER_CPP11)
Note: See TracChangeset for help on using the changeset viewer.