Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
b1d639ec
Commit
b1d639ec
authored
Apr 03, 2013
by
Axel Auweter
Browse files
CollectAgent not yet ready for parallel build -> all projects are built sequentially.
Cassandra Header Fixes are applied only once now.
parent
c49932b4
Changes
2
Show whitespace changes
Inline
Side-by-side
CollectAgent/Makefile
View file @
b1d639ec
...
@@ -8,6 +8,8 @@ TARGET = CollectAgent
...
@@ -8,6 +8,8 @@ TARGET = CollectAgent
SUBTARGETS
=
cassandra-lib
SUBTARGETS
=
cassandra-lib
.PHONY
:
check-thrift-env cassandra-lib clean clean-cassandra-headers install
P
=
$(
shell
cd
$(DCDBDEPLOYPATH)
/lib/
&&
pwd
)
P
=
$(
shell
cd
$(DCDBDEPLOYPATH)
/lib/
&&
pwd
)
U
=
$(
shell
uname
)
U
=
$(
shell
uname
)
...
@@ -34,8 +36,10 @@ check-thrift-env:
...
@@ -34,8 +36,10 @@ check-thrift-env:
cassandra-lib
:
cassandra
cassandra-lib
:
cassandra
@
if
[
"
$U
"
=
"Linux"
]
;
then
\
@
if
[
"
$U
"
=
"Linux"
]
;
then
\
echo
"Fixing Thrift includes... "
;
\
echo
"Fixing Thrift includes... "
;
\
sed
-i
'1i#include <stdint.h>'
cassandra/cassandra_types.h
;
\
grep
stdint cassandra/cassandra_types.h
>
/dev/null
;
\
sed
-i
'1i#include <stdint.h>'
cassandra/Cassandra.h
;
\
if
[
"
$$
?"
-eq
"1"
]
;
then
sed
-i
'1i#include <stdint.h>'
cassandra/cassandra_types.h
;
fi
;
\
grep
stdint cassandra/Cassandra.h
>
/dev/null
;
\
if
[
"
$$
?"
-eq
"1"
]
;
then
sed
-i
'1i#include <stdint.h>'
cassandra/Cassandra.h
;
fi
;
\
fi
fi
cassandra
:
cassandra
:
...
...
Makefile
View file @
b1d639ec
...
@@ -53,7 +53,7 @@ distclean:
...
@@ -53,7 +53,7 @@ distclean:
@
rm
-rf
$(DCDBBUILDPATH)
@
rm
-rf
$(DCDBBUILDPATH)
all
:
$(DCDBBUILDPATH)/.prerequesites
all
:
$(DCDBBUILDPATH)/.prerequesites
make
-j
$(MAKETHREADS)
$(PROJECTS)
make
$(PROJECTS)
$(DCDBBUILDPATH)/.prerequesites
:
$(DCDBBUILDPATH)/.extract-distfiles
$(DCDBBUILDPATH)/.prerequesites
:
$(DCDBBUILDPATH)/.extract-distfiles
@
echo
""
@
echo
""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment