Source: condor Version: 7.8.8~dfsg.1-2 Severity: serious With the recent update of Globus Toolkit to version 5.2.5, the debian packages implements Multi-Arch support. For this reason the install location for the architecture dependent header files had to be changed.
For packages that depend on Globus Toolkit and use pkg-config to find
the location of the headers, this change is seamless. The condor package
however, hardcodes the install location in its cmake files and will fail
to build if a rebuild is attempted.
The attached patch adds the new install location to the build
configuration. (An alternative approach would be to convert the build
configuration to use pkg-config instead, but that might be more
invasive.)
Mattias
PS. At the moment the condor build also fails due to a broken latex2html
that goes into an endless loop during generation of the documentation
files. (See BTS #723913)
diff -ur condor-7.8.8~dfsg.1.orig/externals/bundles/globus/5.0.1-p1/CMakeLists.txt condor-7.8.8~dfsg.1/externals/bundles/globus/5.0.1-p1/CMakeLists.txt
--- condor-7.8.8~dfsg.1.orig/externals/bundles/globus/5.0.1-p1/CMakeLists.txt 2013-07-18 08:25:54.000000000 +0200
+++ condor-7.8.8~dfsg.1/externals/bundles/globus/5.0.1-p1/CMakeLists.txt 2013-12-03 14:46:49.921645208 +0100
@@ -227,7 +227,16 @@
find_multiple( "globus_gass_transfer;globus_gram_client;globus_gram_protocol" GLOBUS_GRID_UNIVERSE_GT2 )
find_multiple( "globus_ftp_control" GLOBUS_GRID_UNIVERSE_NORDUGRID)
if (GLOBUS_FOUND)
- append_var (CONDOR_EXTERNAL_INCLUDE_DIRS "/usr/include/globus;/usr/lib64/globus/include;/usr/lib/globus/include;/usr/local/globus/include/globus")
+ find_program(DPKG_ARCHITECTURE dpkg-architecture)
+ if (DPKG_ARCHITECTURE)
+ execute_process(
+ COMMAND ${DPKG_ARCHITECTURE} -qDEB_HOST_MULTIARCH
+ OUTPUT_VARIABLE DEB_HOST_MULTIARCH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ else()
+ set (DEB_HOST_MULTIARCH no-deb-multiarch)
+ endif()
+ append_var (CONDOR_EXTERNAL_INCLUDE_DIRS "/usr/include/globus;/usr/lib64/globus/include;/usr/lib/globus/include;/usr/include/${DEB_HOST_MULTIARCH}/globus;/usr/local/globus/include/globus")
endif(GLOBUS_FOUND)
endif(NOT PROPER)
signature.asc
Description: This is a digitally signed message part
