From 744d490ae19e901c2f2b5591d20a16ca2f2800ae Mon Sep 17 00:00:00 2001
From: Ramin Yaghoubzadeh <ryaghoub@techfak.uni-bielefeld.de>
Date: Fri, 3 Aug 2012 20:52:01 +0200
Subject: [PATCH] Fixed build on netboot Linux machines
---
.gitignore | 3 +++
ipaacalib/cpp/CMakeLists.txt | 4 ++++
ipaacalib/cpp/src/ipaaca.cc | 8 +++++++-
ipaacalib/python/build.properties | 1 +
ipaacatools/scripts/start-spread-local | 10 ++++++++--
5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 59a87a9..d4905ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
.DS_Store
*/generatedsrc
+*/*/generatedsrc
*/build
*/*/build
*/lib
@@ -18,4 +19,6 @@ Session.vim
**/manifest.mf
**/**/manifest.mf
**/*.*~
+deps
+dist
diff --git a/ipaacalib/cpp/CMakeLists.txt b/ipaacalib/cpp/CMakeLists.txt
index 18727d7..ba3a102 100644
--- a/ipaacalib/cpp/CMakeLists.txt
+++ b/ipaacalib/cpp/CMakeLists.txt
@@ -25,6 +25,10 @@ set(RSBLIBS rsc rsbcore)
#set(LIBS ${LIBS} ${PROTOLIBS} ${RSBLIBS})
set(LIBS ${LIBS} ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${RSBLIBS})
+if (NOT DEFINED APPLE)
+ set(LIBS ${LIBS} uuid)
+endif(NOT DEFINED APPLE)
+
# enhance the default search paths (headers, libs ...)
set(CMAKE_PREFIX_PATH ${PROJECT_SOURCE_DIR}:/opt/local:${CMAKE_PREFIX_PATH})
diff --git a/ipaacalib/cpp/src/ipaaca.cc b/ipaacalib/cpp/src/ipaaca.cc
index ee4c9ba..855acd3 100644
--- a/ipaacalib/cpp/src/ipaaca.cc
+++ b/ipaacalib/cpp/src/ipaaca.cc
@@ -43,10 +43,16 @@ void Initializer::initialize_ipaaca_rsb_if_needed()
std::string generate_uuid_string()
{
uuid_t uuidt;
- uuid_string_t uuidstr;
uuid_generate(uuidt);
+#ifdef __MACOSX__
+ uuid_string_t uuidstr;
uuid_unparse_lower(uuidt, uuidstr);
return uuidstr;
+#else
+ char result_c[37];
+ uuid_unparse_lower(uuidt, result_c);
+ return result_c;
+#endif
}
/*
diff --git a/ipaacalib/python/build.properties b/ipaacalib/python/build.properties
index f8d6c6b..0ff9423 100644
--- a/ipaacalib/python/build.properties
+++ b/ipaacalib/python/build.properties
@@ -6,4 +6,5 @@ pyzip.excludes=
run.py=run.py
publish.resolver=soa.core.repository
dist.dir=../../dist
+extra.python.path=/vol/soa/opt64/python-spread/current/lib/python2.7/site-packages
diff --git a/ipaacatools/scripts/start-spread-local b/ipaacatools/scripts/start-spread-local
index 0e72630..5b79d10 100755
--- a/ipaacatools/scripts/start-spread-local
+++ b/ipaacatools/scripts/start-spread-local
@@ -1,4 +1,10 @@
#!/bin/bash
-echo "Starting local-only spread daemon for ipaaca ..."
-spread -n localhost &
+if [ -d /vol/soa/opt64/spread ]; then
+ echo "Starting local-only spread daemon for ipaaca (from soa volume) ..."
+ LD_LIBRARY_PATH=/vol/soa/opt64/spread/current/lib
+ /vol/soa/opt64/spread/current/sbin/spread -n localhost &
+else
+ echo "Starting local-only spread daemon for ipaaca ..."
+ spread -n localhost &
+fi
--
GitLab