1 files changed, 14 insertions, 15 deletions

diff --git a/src/BuildIt.sh b/src/BuildIt.sh
index 53a57e9..81ad06e 100755
--- a/src/BuildIt.sh
+++ b/src/BuildIt.sh
@@ -2,7 +2,6 @@
 
 mkdir -p build
 
-
 # Poor mans git sub modules / subtrees, coz otherwise it gets complex.
 if [ ! -d git-sub-modules/fcgi2 ]; then
     pushd git-sub-modules >/dev/null
@@ -11,7 +10,7 @@ if [ ! -d git-sub-modules/fcgi2 ]; then
 else
     pushd git-sub-modules/fcgi2 >/dev/null
     echo "Updating fcgi2."
-    git pull | grep "Already up-to-date." && rm -fr build/fcgi2
+#    git pull | grep "Already up-to-date." && rm -fr build/fcgi2
     popd >/dev/null
 fi
 
@@ -29,7 +28,6 @@ fi
 
 echo ""
 echo ""
-echo ""
 
 if [ ! -d git-sub-modules/luajit ]; then
     pushd git-sub-modules >/dev/null
@@ -42,7 +40,7 @@ if [ ! -d git-sub-modules/luajit ]; then
 else
     pushd git-sub-modules/luajit >/dev/null
     echo "Updating LuaJIT."
-    git pull | grep "Already up-to-date." && rm -fr build/luajit
+#    git pull | grep "Already up-to-date." && rm -fr build/luajit
     popd >/dev/null
 fi
 
@@ -58,16 +56,18 @@ fi
 
 echo ""
 echo ""
-echo ""
 
 if [ ! -d git-sub-modules/qlibc ]; then
     pushd git-sub-modules >/dev/null
     git clone https://github.com/wolkykim/qlibc.git
+    pushd qlibc >/dev/null
+    patch -p1  <../../patches/qlibc.patch
+    popd >/dev/null
     popd >/dev/null
 else
     pushd git-sub-modules/qlibc >/dev/null
     echo "Updating qlibc."
-    git pull | grep "Already up-to-date." && rm -fr build/qlibc
+#    git pull | grep "Already up-to-date." && rm -fr build/qlibc
     popd >/dev/null
 fi
 
@@ -84,7 +84,6 @@ fi
 
 echo ""
 echo ""
-echo ""
 
 if [ ! -d git-sub-modules/toybox ]; then
     pushd git-sub-modules >/dev/null
@@ -93,7 +92,7 @@ if [ ! -d git-sub-modules/toybox ]; then
 else
     pushd git-sub-modules/toybox >/dev/null
     echo "Updating toybox."
-    git pull | grep "Already up-to-date." && rm -fr build/toybox
+#    git pull | grep "Already up-to-date." && rm -fr build/toybox
     popd >/dev/null
 fi
 
@@ -119,18 +118,18 @@ fi
 
 echo ""
 echo ""
-echo ""
 
 pushd build/toybox >/dev/null
 export  CFLAGS="-I../luajit/src -I../fcgi2 -I../fcgi2/include -I../qlibc/include/qlibc   $(mysql_config --cflags) -g3"
-export LDFLAGS="-L../luajit/src -L../fcgi2/libfcgi/.libs      -L../qlibc/lib             $(mysql_config --libs) -Wl,-E -l:libluajit.a -l:libqlibcext.a -l:libfcgi.a -l:libqlibc.a -lcrypto -luuid"
+export LDFLAGS="-L../luajit/src -L../fcgi2/libfcgi/.libs      -L../qlibc/lib             $(mysql_config --libs) -Wl,-E -l:libluajit.a -l:libqlibcext.a -l:libfcgi.a -l:libqlibc.a -lcrypto -luuid -lpthread -ldl"
 make  || exit 1
 popd >/dev/null
+ln -fs ../src/build/toybox/generated/unstripped/toybox ../bin/sledjchisl
 
-sudo rm -f /opt/opensim_SC/var/cache/sledjchisl.socket
+#sudo rm -f /opt/opensim_SC/var/cache/sledjchisl.socket
 #sudo rm -f /opt/opensim_SC/var/cache/sessions/*
 #sudo rm -f /opt/opensim_SC/var/lib/users/*
-sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/valgrind --leak-check=full build/toybox/generated/unstripped/toybox sledjchisl
-#sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/valgrind --leak-check=full build/toybox/generated/unstripped/toybox sledjchisl 2>&1 | tee log.txt
-#sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/valgrind --leak-check=full --show-leak-kinds=all build/toybox/generated/unstripped/toybox sledjchisl
-##sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/ddd build/toybox/generated/unstripped/toybox sledjchisl
+#sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/valgrind --leak-check=full build/toybox/generated/unstripped/toybox sledjchisl
+##sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/valgrind --leak-check=full build/toybox/generated/unstripped/toybox sledjchisl 2>&1 | tee log.txt
+##sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/valgrind --leak-check=full --show-leak-kinds=all build/toybox/generated/unstripped/toybox sledjchisl
+###sudo spawn-fcgi -n -u opensimsc -s /opt/opensim_SC/var/cache/sledjchisl.socket -M 0660 -G www-data  -- /usr/bin/ddd build/toybox/generated/unstripped/toybox sledjchisl