aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Kerr <cjk34@cam.ac.uk>2013-06-17 22:06:06 +0100
committerChris Kerr <cjk34@cam.ac.uk>2013-06-17 22:06:06 +0100
commit36e07f56123f20b904134e1e90b602da7f6c7321 (patch)
tree17b2ac799311a3f327d6e101690697975a52d88f /sys-cluster/htcondor
parentChanging CMAKE_INSTALL_PREFIX was a bad idea, trying adding $ENV{DESTDIR} bef... (diff)
downloadsci-36e07f56123f20b904134e1e90b602da7f6c7321.tar.gz
sci-36e07f56123f20b904134e1e90b602da7f6c7321.tar.bz2
sci-36e07f56123f20b904134e1e90b602da7f6c7321.zip
Changed patch format to see if this works better
Diffstat (limited to 'sys-cluster/htcondor')
-rw-r--r--sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
index 9b74018f3..371052dbe 100644
--- a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
+++ b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
@@ -1,5 +1,5 @@
---- src/condor_scripts/CMakeLists.txt.orig 2013-06-17 21:20:57.968455000 +0100
-+++ src/condor_scripts/CMakeLists.txt 2013-06-17 21:23:15.039802000 +0100
+--- a/src/condor_scripts/CMakeLists.txt 2013-06-17 21:20:57.968455000 +0100
++++ b/src/condor_scripts/CMakeLists.txt 2013-06-17 21:23:15.039802000 +0100
@@ -27,9 +27,9 @@
install ( FILES condor_configure DESTINATION ${C_SBIN} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME condor_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
@@ -13,8 +13,8 @@
endif(WANT_FULL_DEPLOYMENT)
install ( FILES condor_ssh sshd.sh DESTINATION ${C_LIBEXEC} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
---- src/condor_tools/CMakeLists.txt.orig 2013-06-17 21:44:18.391088000 +0100
-+++ src/condor_tools/CMakeLists.txt 2013-06-17 21:46:09.950286000 +0100
+--- a/src/condor_tools/CMakeLists.txt 2013-06-17 21:44:18.391088000 +0100
++++ b/src/condor_tools/CMakeLists.txt 2013-06-17 21:46:09.950286000 +0100
@@ -102,13 +102,13 @@
if ( LINUX AND NOT CONDOR_PACKAGE_BUILD )
set( SRC_DIR ${CMAKE_SOURCE_DIR} )