[122417] trunk/dports/science/htcondor
aronnax at macports.org
aronnax at macports.org
Tue Jul 22 07:19:39 PDT 2014
Revision: 122417
https://trac.macports.org/changeset/122417
Author: aronnax at macports.org
Date: 2014-07-22 07:19:39 -0700 (Tue, 22 Jul 2014)
Log Message:
-----------
htcondor: update to 8.2.1
Modified Paths:
--------------
trunk/dports/science/htcondor/Portfile
trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff
trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff
trunk/dports/science/htcondor/files/patch-src-classad-util.cpp.diff
Modified: trunk/dports/science/htcondor/Portfile
===================================================================
--- trunk/dports/science/htcondor/Portfile 2014-07-22 14:14:33 UTC (rev 122416)
+++ trunk/dports/science/htcondor/Portfile 2014-07-22 14:19:39 UTC (rev 122417)
@@ -7,10 +7,9 @@
PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
-github.setup htcondor htcondor 8_1_1 V
+github.setup htcondor htcondor 8_2_1 V
version [strsed ${github.version} g/_/\./]
maintainers aronnax
-revision 3
categories science parallel net
license apache
@@ -74,8 +73,8 @@
}]
}
-checksums rmd160 87af615b5a2a5b347f281ddc06e508be94681766 \
- sha256 6b299e52368de505e3391d72ef5482550103bc36f7f526da33d52303d8a9233e
+checksums rmd160 39aa3a05b99bb3ae03f9836f96b3e694664013d9 \
+ sha256 794d90f672ab19ebf40269dcea3ac299bf6a84a1cf09f46591b1baf4e6bf4a72
depends_build-append port:latex2html
@@ -95,18 +94,6 @@
patch-src-python-bindings-CMakeLists.txt.diff \
patch-build-cmake-CondorPackageConfig.cmake.diff
-# Fix error on Lion:
-# htcondor-8_1_1/src/classad/util.cpp:433:9: error: use of undeclared identifier 'finite'
-patchfiles-append patch-src-classad-util.cpp.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} >= 11} {
- 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
@@ -171,8 +158,8 @@
}
# Override default GitHub livecheck because the HTCondor git repository has
-# thousands of tags, and GitHub has to paginate the tags.
+# tens of thousands of tags, and GitHub has to paginate the tags.
livecheck.type regexm
livecheck.url ${homepage}/downloads/
livecheck.version ${version}
-livecheck.regex {Current Developer Release</td>\s*<td [^>]*>([0-9]+(\.[0-9]+)+)}
+livecheck.regex {Current Stable Release</td>\s*<td [^>]*>([0-9]+(\.[0-9]+)+)}
Deleted: trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff 2014-07-22 14:14:33 UTC (rev 122416)
+++ trunk/dports/science/htcondor/files/patch-build-cmake-CondorConfigure.cmake.diff 2014-07-22 14:19:39 UTC (rev 122417)
@@ -1,32 +0,0 @@
---- 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)
Deleted: trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff 2014-07-22 14:14:33 UTC (rev 122416)
+++ trunk/dports/science/htcondor/files/patch-doc-makeman-makeman.C.diff 2014-07-22 14:19:39 UTC (rev 122417)
@@ -1,11 +0,0 @@
---- 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);
- }
Deleted: trunk/dports/science/htcondor/files/patch-src-classad-util.cpp.diff
===================================================================
--- trunk/dports/science/htcondor/files/patch-src-classad-util.cpp.diff 2014-07-22 14:14:33 UTC (rev 122416)
+++ trunk/dports/science/htcondor/files/patch-src-classad-util.cpp.diff 2014-07-22 14:19:39 UTC (rev 122417)
@@ -1,97 +0,0 @@
---- src/classad/util.cpp.orig 2013-10-27 21:00:59.000000000 -0700
-+++ src/classad/util.cpp 2013-10-27 21:01:02.000000000 -0700
-@@ -24,36 +24,10 @@
- #include "classad/util.h"
- #include <limits.h>
- #include <math.h>
-+#include <boost/math/special_functions/fpclassify.hpp>
-
- using namespace std;
-
--// The following definitions of isnan() and isinf() are recommended here:
--// http://www.gnu.org/software/libtool/manual/autoconf/Function-Portability.html
--// We have observed isinf(HUGE_VAL) to return 0 on HPUX, but only apparently
--// because of an errant #pragma extern applied to this constant in the system
--// header files. When passed a normal variable assigned to HUGE_VAL, isinf()
--// does the right thing on that platform.
--
--#ifndef isnan
--# define isnan(x) \
-- (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
-- : sizeof (x) == sizeof (double) ? isnan_d (x) \
-- : isnan_f (x))
--static inline int isnan_f (float x) { return x != x; }
--static inline int isnan_d (double x) { return x != x; }
--static inline int isnan_ld (long double x) { return x != x; }
--#endif
--
--#ifndef isinf
--# define isinf(x) \
-- (sizeof (x) == sizeof (long double) ? isinf_ld (x) \
-- : sizeof (x) == sizeof (double) ? isinf_d (x) \
-- : isinf_f (x))
--static inline int isinf_f (float x) { return isnan (x - x); }
--static inline int isinf_d (double x) { return isnan (x - x); }
--static inline int isinf_ld (long double x) { return isnan (x - x); }
--#endif
--
- namespace classad {
-
- #ifdef WIN32
-@@ -406,42 +380,9 @@
- return leap_year;
- }
-
--#ifdef WIN32
--int classad_isinf(double x)
--{
--
-- int result;
-- result = _fpclass(x);
--
-- if (result == _FPCLASS_NINF ) {
-- /* negative infinity */
-- return -1;
-- } else if ( result == _FPCLASS_PINF ) {
-- /* positive infinity */
-- return 1;
-- } else {
-- /* otherwise */
-- return 0;
-- }
--}
--#elif (defined (__SVR4) && defined (__sun)) || defined(__APPLE_CC__)
--#ifndef __APPLE_CC__
--#include <ieeefp.h>
--#endif
--int classad_isinf(double x)
--{
-- if (finite(x) || x != x) {
-- return 0;
-- } else if (x > 0) {
-- return 1;
-- } else {
-- return -1;
-- }
--}
--#else
- int classad_isinf(double x)
- {
-- if (!isinf(x) || x != x) {
-+ if (boost::math::isfinite(x) || boost::math::isnan(x)) {
- return 0;
- } else if (x > 0) {
- return 1;
-@@ -449,11 +390,10 @@
- return -1;
- }
- }
--#endif
-
- int classad_isnan(double x)
- {
-- return isnan(x);
-+ return boost::math::isnan(x);
- }
-
- } // classad
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 2014-07-22 14:14:33 UTC (rev 122416)
+++ trunk/dports/science/htcondor/files/patch-src-python-bindings-CMakeLists.txt.diff 2014-07-22 14:19:39 UTC (rev 122417)
@@ -1,25 +1,14 @@
---- 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!")
+--- src/python-bindings/CMakeLists.txt.orig 2014-07-17 11:44:13.000000000 -0700
++++ src/python-bindings/CMakeLists.txt 2014-07-17 11:44:25.000000000 -0700
+@@ -11,9 +11,9 @@
+ set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG)
+
+ if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3")
+- set ( PYTHON_BOOST_LIB boost_python3 )
++ set ( PYTHON_BOOST_LIB boost_python3-mt )
+ else()
+- set ( PYTHON_BOOST_LIB boost_python )
++ set ( PYTHON_BOOST_LIB boost_python-mt )
endif()
- 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}" )
- set_target_properties( pyclassad PROPERTIES COMPILE_FLAGS "-fPIC")
- # Note we do not use condor_shared_lib below because we want a separate install target.
- add_library( classad_module SHARED classad_module.cpp )
-- target_link_libraries( classad_module pyclassad -lboost_python ${PYTHON_LIBRARIES} )
-+ target_link_libraries( classad_module pyclassad -lboost_python-mt ${PYTHON_LIBRARIES} )
- set_target_properties(classad_module PROPERTIES PREFIX "" OUTPUT_NAME classad )
- set_target_properties(classad_module PROPERTIES SUFFIX ".so" )
-
- 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")
- 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 )
-- target_link_libraries( htcondor pyclassad condor_utils -lboost_python ${PYTHON_LIBRARIES} )
-+ target_link_libraries( htcondor pyclassad condor_utils -lboost_python-mt ${PYTHON_LIBRARIES} )
- set_target_properties( htcondor PROPERTIES PREFIX "" )
- set_target_properties( htcondor PROPERTIES SUFFIX ".so" )
-
+ include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE})
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140722/5b6c9cd1/attachment-0001.html>
More information about the macports-changes
mailing list