git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into full-month-stats
[stg.git]
/
projects
/
rlm_stg
/
build
diff --git
a/projects/rlm_stg/build
b/projects/rlm_stg/build
index f875736a2c78da476f37b6302e5bcb0e83ae9e87..0145d0388fd79e7e45326ce4375d597edaa9e711 100755
(executable)
--- a/
projects/rlm_stg/build
+++ b/
projects/rlm_stg/build
@@
-24,7
+24,7
@@
else
then
DEFS="-DDEBUG"
MAKEOPTS="-j1"
then
DEFS="-DDEBUG"
MAKEOPTS="-j1"
- CXXFLAGS="$CXXFLAGS -g3 -W -Wall"
+ CXXFLAGS="$CXXFLAGS -g
gdb
3 -W -Wall"
else
MAKEOPTS="-j1"
fi
else
MAKEOPTS="-j1"
fi
@@
-48,6
+48,7
@@
then
6) OS=bsd5;;
7) OS=bsd7;;
8) OS=bsd7;;
6) OS=bsd5;;
7) OS=bsd7;;
8) OS=bsd7;;
+ 9) OS=bsd7;;
*) OS=unknown;;
esac
MAKE="gmake"
*) OS=unknown;;
esac
MAKE="gmake"
@@
-71,7
+72,6
@@
if [ "$OS" = "linux" ]
then
DEFS="$DEFS -DLINUX"
LIB_THREAD=-lpthread
then
DEFS="$DEFS -DLINUX"
LIB_THREAD=-lpthread
- SHELL="/bin/bash"
else
if [ "$OS" = "bsd" ]
then
else
if [ "$OS" = "bsd" ]
then
@@
-85,7
+85,6
@@
else
LIB_THREAD=-lc_r
fi
fi
LIB_THREAD=-lc_r
fi
fi
- SHELL="/usr/local/bin/bash"
CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM"
fi
CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM"
fi
@@
-120,7
+119,7
@@
echo "found"
echo -n "Checking endianess... "
echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
echo -n "Checking endianess... "
echo "int main() { int probe = 0x00000001; return *(char *)&probe; }" > build_check.c
-$CC $C
XX
FLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
+$CC $CFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null
if [ $? != 0 ]
then
echo "FAIL!"
if [ $? != 0 ]
then
echo "FAIL!"
@@
-132,10
+131,12
@@
else
then
ARCH=le
CXXFLAGS="$CXXFLAGS -DARCH_LE"
then
ARCH=le
CXXFLAGS="$CXXFLAGS -DARCH_LE"
+ CFLAGS="$CFLAGS -DARCH_LE"
echo "Little Endian"
else
ARCH=be
CXXFLAGS="$CXXFLAGS -DARCH_BE"
echo "Little Endian"
else
ARCH=be
CXXFLAGS="$CXXFLAGS -DARCH_BE"
+ CFLAGS="$CFLAGS -DARCH_BE"
echo "Big Endian"
fi
fi
echo "Big Endian"
fi
fi
@@
-156,7
+157,7
@@
do
done
echo "" >> $CONFFILE
echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
done
echo "" >> $CONFFILE
echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE
-echo "CFLAGS=$C
XX
FLAGS" >> $CONFFILE
+echo "CFLAGS=$CFLAGS" >> $CONFFILE
echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
echo "PREFIX=$PREFIX" >> $CONFFILE
echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
echo "PREFIX=$PREFIX" >> $CONFFILE
@@
-164,6
+165,5
@@
echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
echo "OWNER=$OWNER" >> $CONFFILE
echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
echo "OWNER=$OWNER" >> $CONFFILE
-echo "SHELL=$SHELL" >> $CONFFILE
$MAKE $MAKEOPTS
$MAKE $MAKEOPTS