Date: Mon, 10 Dec 2018 21:40:55 +0000 (UTC) From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487202 - in head/sysutils/condor: . files Message-ID: <201812102140.wBALetw7081479@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jwb Date: Mon Dec 10 21:40:55 2018 New Revision: 487202 URL: https://svnweb.freebsd.org/changeset/ports/487202 Log: sysutils/condor: Permanent fix for FreeBSD 13 and all future versions Previous HTCondor code checks for each FreeBSD version individually. Add a generic patch to cover all current and future FreeBSD versions. Approved by: jrm (mentor, implicit) Added: head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake (contents, props changed) Modified: head/sysutils/condor/Makefile head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake Modified: head/sysutils/condor/Makefile ============================================================================== --- head/sysutils/condor/Makefile Mon Dec 10 21:09:38 2018 (r487201) +++ head/sysutils/condor/Makefile Mon Dec 10 21:40:55 2018 (r487202) @@ -6,7 +6,7 @@ PORTNAME= condor DISTVERSION= 8.4.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils net MASTER_SITES= http://www.acadix.biz/Ports/distfiles/ DISTNAME= condor_src-${PORTVERSION}-all-all @@ -27,6 +27,7 @@ LIB_DEPENDS= libkrb5support.so:security/krb5 \ USES= cmake:noninja compiler:c++11-lang cpe perl5 pgsql \ python:2.7 shebangfix ssl USE_LDCONFIG= yes + CPE_VENDOR= condor_project SHEBANG_FILES= src/condor_scripts/condor_qsub \ src/condor_gridmanager/remote_gahp \ @@ -46,7 +47,7 @@ CMAKE_ARGS= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \ -DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so SUB_FILES= condor-config condor_config.local pkg-message -PLIST_SUB+= CONDOR_UVER=${PORTVERSION:S/./_/g} +PLIST_SUB= CONDOR_UVER=${PORTVERSION:S/./_/g} USERS= condor GROUPS= ${USERS} @@ -62,7 +63,7 @@ pre-everything:: @( ${PRINTF} "\nWARNING: Condor needs approximately 3GB to build!"; \ ${PRINTF} " Please make sure your build environment has that much space before continuing.\n" ) -post-patch: +pre-configure: @${REINPLACE_CMD} \ -e 's,\(set( C_SHARE_EXAMPLES \)share/condor,\1${EXAMPLESDIR_REL},' \ ${WRKSRC}/build/cmake/CondorPackageConfig.cmake Modified: head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake ============================================================================== --- head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake Mon Dec 10 21:09:38 2018 (r487201) +++ head/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake Mon Dec 10 21:40:55 2018 (r487202) @@ -1,20 +1,29 @@ ---- build/cmake/macros/SystemSpecificInformations.cmake.orig 2016-09-29 11:34:28 UTC +--- build/cmake/macros/SystemSpecificInformations.cmake.orig 2017-07-06 19:22:42 UTC +++ build/cmake/macros/SystemSpecificInformations.cmake -@@ -265,6 +265,7 @@ if(UNIX) +@@ -265,6 +265,8 @@ if(UNIX) set( SYSTEM_NAME "freebsd_${FREEBSD_RELEASE}" ) set( CONDOR_FREEBSD ON ) set( BSD_UNIX ON ) -+ # FIXME: Is there a >= to replace all the MATCHES operators below? ++ # FreeBSD 8 and later just use CONDOR_FREEBSD ++ # FreeBSD 9 and later require utmpx if(FREEBSD_MAJOR MATCHES "4" ) set( CONDOR_FREEBSD4 ON ) elseif(FREEBSD_MAJOR MATCHES "5" ) -@@ -284,6 +285,9 @@ if(UNIX) - elseif(FREEBSD_MAJOR MATCHES "11" ) - set( CONDOR_FREEBSD11 ON ) +@@ -273,16 +275,7 @@ if(UNIX) + set( CONDOR_FREEBSD6 ON ) + elseif(FREEBSD_MAJOR MATCHES "7" ) + set( CONDOR_FREEBSD7 ON ) +- elseif(FREEBSD_MAJOR MATCHES "8" ) +- set( CONDOR_FREEBSD8 ON ) +- elseif(FREEBSD_MAJOR MATCHES "9" ) +- set( CONDOR_FREEBSD9 ON ) +- set( CONDOR_UTMPX ON ) +- elseif(FREEBSD_MAJOR MATCHES "10" ) +- set( CONDOR_FREEBSD10 ON ) +- set( CONDOR_UTMPX ON ) +- elseif(FREEBSD_MAJOR MATCHES "11" ) +- set( CONDOR_FREEBSD11 ON ) ++ elseif(FREEBSD_MAJOR GREATER "8" ) set( CONDOR_UTMPX ON ) -+ elseif(FREEBSD_MAJOR MATCHES "12" ) -+ set( CONDOR_FREEBSD11 ON ) -+ set( CONDOR_UTMPX ON ) endif() if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" ) - set( SYS_ARCH "x86_64") Added: head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/condor/files/patch-src_condor__includes_config.h.cmake Mon Dec 10 21:40:55 2018 (r487202) @@ -0,0 +1,13 @@ +--- src/condor_includes/config.h.cmake.orig 2018-12-10 14:54:32 UTC ++++ src/condor_includes/config.h.cmake +@@ -49,10 +49,6 @@ + #cmakedefine CONDOR_FREEBSD6 + /* Define if on FreeBSD 7 */ + #cmakedefine CONDOR_FREEBSD7 +-///* Define if on FreeBSD 8 */ +-#cmakedefine CONDOR_FREEBSD8 +-///* Define if on FreeBSD 9 */ +-#cmakedefine CONDOR_FREEBSD9 + ///* Define if on FreeBSD 9 or later, which use utmpx insead of utmp */ + #cmakedefine CONDOR_UTMPX + ///* Define if on FreeBSD */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812102140.wBALetw7081479>