Fixing package generations

sithhell · Nov 3, 2015 · 17fbfbf · 17fbfbf
1 parent 57aaf5c
commit 17fbfbf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/babbage/install.sh b/babbage/install.sh
@@ -21,11 +21,11 @@ CXX=`which icpc`
 CFLAGS="-mmic"
 CXXFLAGS="-std=c++14 -mmic -DBOOST_NO_CXX11_ALLOCATOR"
 LDFLAGS="-mmic"
-make_hwloc "babbage/mic/hwloc" --host=x86_64-k1om-linux
-make_jemalloc "babbage/mic/jemalloc" --host=x86_64-k1om-linux
-make_lua "babbage/mic/lua"
-make_ah "babbage/mic/activeharmony"
-make_boost "babbage/mic/boost" toolset=intel
+#make_hwloc "babbage/mic/hwloc" --host=x86_64-k1om-linux
+#make_jemalloc "babbage/mic/jemalloc" --host=x86_64-k1om-linux
+#make_lua "babbage/mic/lua"
+#make_ah "babbage/mic/activeharmony"
+#make_boost "babbage/mic/boost" toolset=intel
 
 echo ""
 echo "Building HPX Debug version for the XeonPhi"

diff --git a/misc/hpx.sh b/misc/hpx.sh
@@ -19,14 +19,17 @@ function hpx_cmake()
     mkdir -p $BASE_PATH/packages/$PREFIX/hpx/$BUILD_TYPE
     cd $BASE_PATH/packages/$PREFIX/hpx/$BUILD_TYPE
     TMP_LOG=$BASE_PATH/packages/$PREFIX/hpx/$BUILD_TYPE/$$.log
+    CMAKE_TOOLCHAIN_FILE=
+    if [ x"$TOOLCHAIN_FILE" != x"" ]
+    then
+        CMAKE_TOOLCHAIN_FILE="-DCMAKE_TOOLCHAIN_FILE=$BASE_PATH/source/hpx/cmake/toolchains/$TOOLCHAIN_FILE"
+        CMAKE_BASE="cmake $CMAKE_TOOLCHAIN_FILE"
+    else
+        CMAKE_BASE="cmake"
+    fi
     if [ ! -f cmake_done ]
     then
         echo -n "Configuring HPX ($BUILD_TYPE)..."
-        CMAKE_TOOLCHAIN_FILE=
-        if [ x"$TOOLCHAIN_FILE" != x"" ]
-        then
-            CMAKE_TOOLCHAIN_FILE="-DCMAKE_TOOLCHAIN_FILE=$BASE_PATH/source/hpx/cmake/toolchains/$TOOLCHAIN_FILE"
-        fi
         CMAKE_MPI_CXX_COMPILER=
         if [ x"$MPI_CXX_COMPILER" != x"" ]
         then
@@ -88,11 +91,13 @@ function hpx_cmake()
         echo "done"
     fi
 
-    cat << EOF >> $BASE_PATH/packages/$PREFIX/hpx/$BUILD_TYPE/bin/hpxcmake
+    cat << EOF > $BASE_PATH/packages/$PREFIX/hpx/$BUILD_TYPE/bin/hpxcmake
 #!/bin/bash
-cmake -DCMAKE_CXX_COMPILER=${CXX} \
-    -DCMAKE_C_COMPILER=${CC} \
-    -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+$CMAKE_BASE \\
+    -DCMAKE_CXX_COMPILER=${CXX} \\
+    -DCMAKE_C_COMPILER=${CC} \\
+    -DCMAKE_BUILD_TYPE=$BUILD_TYPE \\
+    -DHPX_WITH_MALLOC=jemalloc \\
     "\$@"
 EOF
     chmod +x $BASE_PATH/packages/$PREFIX/hpx/$BUILD_TYPE/bin/hpxcmake

diff --git a/misc/hpxlua.sh b/misc/hpxlua.sh
@@ -25,7 +25,7 @@ function hpxlua_cmake()
         echo -n "Configuring HPX LUA ($BUILD_TYPE)..."
         $HPX_BASE/bin/hpxcmake $BASE_PATH/source/hpx_script/lua \
             -DHPX_DIR=$HPX_BASE/lib/cmake/HPX \
-            -DLUA_DIR=$BASE_PATH/packages/$PREFIX/lua
+            -DLUA_DIR=$BASE_PATH/packages/$PREFIX/lua &> $TMP_LOG
         if [ $? != 0 ]
         then
             echo "failed"
@@ -49,7 +49,7 @@ function hpxlua_cmake()
     fi
 
     ln -sf $BASE_PATH/packages/$PREFIX/hpxlua/$BUILD_TYPE/xlua \
-        $HPX_BASE/bin/xlua
+        $HPX_BASE/bin/xlua &> /dev/null
     ln -sf $BASE_PATH/packages/$PREFIX/hpxlua/$BUILD_TYPE/hello \
-        $HPX_BASE/bin/xlua_hello
+        $HPX_BASE/bin/xlua_hello &> /dev/null
 }