[112613] trunk/dports/science/htcondor
aronnax at macports.org
aronnax at macports.org
Sun Oct 27 20:02:41 PDT 2013
Revision: 112613
https://trac.macports.org/changeset/112613
Author: aronnax at macports.org
Date: 2013-10-27 20:02:40 -0700 (Sun, 27 Oct 2013)
Log Message:
-----------
htcondor: update to 8.1.1 and fix build on Mavericks
Modified Paths:
--------------
trunk/dports/science/htcondor/Portfile
trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
Added Paths:
-----------
trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff
trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff
Modified: trunk/dports/science/htcondor/Portfile
===================================================================
--- trunk/dports/science/htcondor/Portfile 2013-10-28 02:00:13 UTC (rev 112612)
+++ trunk/dports/science/htcondor/Portfile 2013-10-28 03:02:40 UTC (rev 112613)
@@ -7,9 +7,8 @@
PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
-github.setup htcondor htcondor 8_1_0 V
+github.setup htcondor htcondor 8_1_1 V
version [strsed ${github.version} g/_/\./]
-revision 1
maintainers aronnax
categories science parallel net
@@ -74,8 +73,8 @@
}]
}
-checksums rmd160 6d0dfea4966e5cf475257c52562530174f9af606 \
- sha256 f16eef183636d08b2e344f06c9c856ef1e5313479efee06371965187b1d606a6
+checksums rmd160 87af615b5a2a5b347f281ddc06e508be94681766 \
+ sha256 6b299e52368de505e3391d72ef5482550103bc36f7f526da33d52303d8a9233e
depends_build-append port:latex2html
@@ -95,25 +94,19 @@
patch-src-python-bindings-CMakeLists.txt.diff \
patch-build-cmake-CondorPackageConfig.cmake.diff
+# makeman.C:182:26: error: no member named '_Ios_Fmtflags' in namespace 'std'
+patchfiles-append patch-doc-makeman-makeman.C.diff
+
+# ar: -lc++: No such file or directory
+if {${os.major} >= 13} {
+ patchfiles-append patch-build-cmake-CondorConfigure.cmake.diff
+}
+
post-patch {
reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/src/condor_utils/condor_config.cpp
reinplace "s|g\+\+|${configure.cxx}|g" ${worksrcpath}/doc/makeman/Makefile
}
-# makeman.C:182:26: error: no member named '_Ios_Fmtflags' in namespace 'std'
-compiler.blacklist *clang*
-
-platform darwin {
- if {${os.major} >= 13} {
- depends_lib
- depends_run
- pre-fetch {
- ui_error "$name does not build on Mavericks or later."
- error "unsupported platform"
- }
- }
-}
-
# FIXME: Globus support is disabled because Globus is not available in MacPorts.
configure.args-append -DWITH_GLOBUS:BOOL="0" -DBUILD_TESTING:BOOL="0"
Added: trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff (rev 0)
+++ trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff 2013-10-28 03:02:40 UTC (rev 112613)
@@ -0,0 +1,32 @@
+--- 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" )
+- 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")
+
+ 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)
Added: trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff (rev 0)
+++ trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff 2013-10-28 03:02:40 UTC (rev 112613)
@@ -0,0 +1,11 @@
+--- doc/makeman/makeman.C.orig 2013-10-27 19:53:22.000000000 -0700
++++ doc/makeman/makeman.C 2013-10-27 19:53:53.000000000 -0700
+@@ -179,7 +179,7 @@
+ #if (__GNUC__<3)
+ input_file.flags(0);
+ #else
+- input_file.flags((std::_Ios_Fmtflags)0);
++ input_file.flags((std::ios_base::fmtflags)0);
+ #endif
+ process_file(input_file, output_file, parameters);
+ }
Modified: trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff 2013-10-28 02:00:13 UTC (rev 112612)
+++ trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff 2013-10-28 03:02:40 UTC (rev 112613)
@@ -1,9 +1,9 @@
---- src/python-bindings/CMakeLists.txt.orig 2013-06-07 00:30:54.000000000 -0700
-+++ src/python-bindings/CMakeLists.txt 2013-06-07 00:31:12.000000000 -0700
+--- src/python-bindings/CMakeLists.txt.orig 2013-10-27 19:34:11.000000000 -0700
++++ src/python-bindings/CMakeLists.txt 2013-10-27 19:34:42.000000000 -0700
@@ -21,19 +21,19 @@
message(FATAL_ERROR "Can't determine HTCondor version!")
endif()
- condor_static_lib( pyclassad classad.cpp classad_wrapper.h exprtree_wrapper.h )
+ condor_shared_lib( pyclassad classad.cpp classad_wrapper.h exprtree_wrapper.h )
- target_link_libraries( pyclassad ${CLASSADS_FOUND} ${PYTHON_LIBRARIES} -lboost_python )
+ target_link_libraries( pyclassad ${CLASSADS_FOUND} ${PYTHON_LIBRARIES} -lboost_python-mt )
set_target_properties( pyclassad PROPERTIES OUTPUT_NAME "${PYCLASSAD_LIB_NAME}" )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131027/a59e8270/attachment.html>
More information about the macports-changes
mailing list