Ignore:
Timestamp:
Jul 22, 2014, 2:19:39 PM (6 years ago)
Author:
aronnax@…
Message:

htcondor: update to 8.2.1

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

Legend:

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

    r113984 r122417  
    88PortGroup               conflicts_build 1.0
    99
    10 github.setup            htcondor htcondor 8_1_1 V
     10github.setup            htcondor htcondor 8_2_1 V
    1111version                 [strsed ${github.version} g/_/\./]
    1212maintainers             aronnax
    13 revision                3
    1413
    1514categories              science parallel net
     
    7574}
    7675
    77 checksums               rmd160  87af615b5a2a5b347f281ddc06e508be94681766 \
    78                         sha256  6b299e52368de505e3391d72ef5482550103bc36f7f526da33d52303d8a9233e
     76checksums               rmd160  39aa3a05b99bb3ae03f9836f96b3e694664013d9 \
     77                        sha256  794d90f672ab19ebf40269dcea3ac299bf6a84a1cf09f46591b1baf4e6bf4a72
    7978
    8079depends_build-append    port:latex2html
     
    9594                        patch-src-python-bindings-CMakeLists.txt.diff \
    9695                        patch-build-cmake-CondorPackageConfig.cmake.diff
    97 
    98 # Fix error on Lion:
    99 # htcondor-8_1_1/src/classad/util.cpp:433:9: error: use of undeclared identifier 'finite'
    100 patchfiles-append       patch-src-classad-util.cpp.diff
    101 
    102 # makeman.C:182:26: error: no member named '_Ios_Fmtflags' in namespace 'std'
    103 patchfiles-append       patch-doc-makeman-makeman.C.diff
    104 
    105 # ar: -lc++: No such file or directory
    106 if {${os.major} >= 11} {
    107     patchfiles-append   patch-build-cmake-CondorConfigure.cmake.diff
    108 }
    10996
    11097post-patch {
     
    172159
    173160# Override default GitHub livecheck because the HTCondor git repository has
    174 # thousands of tags, and GitHub has to paginate the tags.
     161# tens of thousands of tags, and GitHub has to paginate the tags.
    175162livecheck.type          regexm
    176163livecheck.url           ${homepage}/downloads/
    177164livecheck.version       ${version}
    178 livecheck.regex         {Current Developer Release</td>\s*<td [^>]*>([0-9]+(\.[0-9]+)+)}
     165livecheck.regex         {Current Stable Release</td>\s*<td [^>]*>([0-9]+(\.[0-9]+)+)}
  • trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff

    r112613 r122417  
    1 --- src/python-bindings/CMakeLists.txt.orig     2013-10-27 19:34:11.000000000 -0700
    2 +++ src/python-bindings/CMakeLists.txt  2013-10-27 19:34:42.000000000 -0700
    3 @@ -21,19 +21,19 @@
    4      message(FATAL_ERROR "Can't determine HTCondor version!")
     1--- src/python-bindings/CMakeLists.txt.orig     2014-07-17 11:44:13.000000000 -0700
     2+++ src/python-bindings/CMakeLists.txt  2014-07-17 11:44:25.000000000 -0700
     3@@ -11,9 +11,9 @@
     4   set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG)
     5 
     6   if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3")
     7-    set ( PYTHON_BOOST_LIB boost_python3 )
     8+    set ( PYTHON_BOOST_LIB boost_python3-mt )
     9   else()
     10-    set ( PYTHON_BOOST_LIB boost_python )
     11+    set ( PYTHON_BOOST_LIB boost_python-mt )
    512   endif()
    6    condor_shared_lib( pyclassad classad.cpp classad_wrapper.h exprtree_wrapper.h )
    7 -  target_link_libraries( pyclassad ${CLASSADS_FOUND} ${PYTHON_LIBRARIES} -lboost_python )
    8 +  target_link_libraries( pyclassad ${CLASSADS_FOUND} ${PYTHON_LIBRARIES} -lboost_python-mt )
    9    set_target_properties( pyclassad PROPERTIES OUTPUT_NAME "${PYCLASSAD_LIB_NAME}" )
    10    set_target_properties( pyclassad PROPERTIES COMPILE_FLAGS "-fPIC")
    1113 
    12    # Note we do not use condor_shared_lib below because we want a separate install target.
    13    add_library( classad_module SHARED classad_module.cpp )
    14 -  target_link_libraries( classad_module pyclassad -lboost_python ${PYTHON_LIBRARIES} )
    15 +  target_link_libraries( classad_module pyclassad -lboost_python-mt ${PYTHON_LIBRARIES} )
    16    set_target_properties(classad_module PROPERTIES PREFIX "" OUTPUT_NAME classad )
    17    set_target_properties(classad_module PROPERTIES SUFFIX ".so" )
    18  
    19    set_source_files_properties(config.cpp collector.cpp secman.cpp dc_tool.cpp schedd.cpp classad.cpp classad_module.cpp PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing -Wno-cast-qual -Wno-deprecated")
    20    add_library( htcondor SHARED htcondor.cpp collector.cpp config.cpp daemon_and_ad_types.cpp dc_tool.cpp export_headers.h old_boost.h schedd.cpp secman.cpp )
    21 -  target_link_libraries( htcondor pyclassad condor_utils -lboost_python ${PYTHON_LIBRARIES} )
    22 +  target_link_libraries( htcondor pyclassad condor_utils -lboost_python-mt ${PYTHON_LIBRARIES} )
    23    set_target_properties( htcondor PROPERTIES PREFIX "" )
    24    set_target_properties( htcondor PROPERTIES SUFFIX ".so" )
    25  
     14   include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE})
Note: See TracChangeset for help on using the changeset viewer.