From fbc20e6aed72935976a8a513ef686311a410fe12 Mon Sep 17 00:00:00 2001 From: a-brandt Date: Fri, 19 Oct 2012 15:26:10 +0200 Subject: [PATCH 1/2] added some extra options for "make on centos 5 --- Installation/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Installation/build.sh b/Installation/build.sh index 40199247e2..e5a400ed99 100755 --- a/Installation/build.sh +++ b/Installation/build.sh @@ -11,6 +11,7 @@ OPTIONS="--disable-dependency-tracking --disable-relative" PREFIX="--prefix=/usr --localstatedir=/var --sysconfdir=/etc" RESULTS="arangod arangosh arangoimp" USE_ICECC="no" +EXTRA_MAKE_OPTIONS="" export CPPFLAGS="" export LDFLAGS="" @@ -105,6 +106,7 @@ case $TRI_OS_LONG in LDD_INFO="yes" # bugfix for readline on CentOS 5: export LIBS="-lncurses" + EXTRA_MAKE_OPTIONS="LDFLAGS=\"-g -pthread -lncurses\"" ;; Linux-Ubuntu-*) @@ -165,11 +167,11 @@ unset LIBS echo echo "########################################################" echo "compile:" -echo " make -j $MAKEJ" +echo " make -j $MAKEJ ${EXTRA_MAKE_OPTIONS}" echo "########################################################" echo -make -j $MAKEJ || exit 1 +make -j $MAKEJ ${EXTRA_MAKE_OPTIONS} || exit 1 for result in $RESULTS; do echo From c70d081fc949fd16ec365f241202f074110fbfcf Mon Sep 17 00:00:00 2001 From: a-brandt Date: Fri, 19 Oct 2012 16:02:31 +0200 Subject: [PATCH 2/2] one more try for centos 5 --- Installation/build.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Installation/build.sh b/Installation/build.sh index e5a400ed99..bfbb0b695a 100755 --- a/Installation/build.sh +++ b/Installation/build.sh @@ -105,8 +105,7 @@ case $TRI_OS_LONG in OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby" LDD_INFO="yes" # bugfix for readline on CentOS 5: - export LIBS="-lncurses" - EXTRA_MAKE_OPTIONS="LDFLAGS=\"-g -pthread -lncurses\"" + export READLINE_LDFLAGS="-lncurses" ;; Linux-Ubuntu-*) @@ -161,17 +160,14 @@ echo ./configure $PREFIX $OPTIONS || exit 1 -# bugfix for readline on CentOS 5: -unset LIBS - echo echo "########################################################" echo "compile:" -echo " make -j $MAKEJ ${EXTRA_MAKE_OPTIONS}" +echo " make -j $MAKEJ " echo "########################################################" echo -make -j $MAKEJ ${EXTRA_MAKE_OPTIONS} || exit 1 +make -j $MAKEJ || exit 1 for result in $RESULTS; do echo