[Devil-linux-commit] build/scripts settings,1.66,1.67

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv13390

Modified Files:
	settings 
Log Message:
seems like we need pic enabled all the time
this is more secure anyway and doesn't require the custom gcc patch
not perfect security, but better than nothing for the server build


Index: settings
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/settings,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- settings	26 Nov 2011 16:28:40 -0000	1.66
+++ settings	29 Nov 2011 01:12:26 -0000	1.67
@@ -106,25 +106,22 @@
 
 KERNEL_CONFIG_DIR=$DL_DIR/scripts/config/linux-$CONFIG_LINUX_VERSION
 
+# make sure this is not set, otherwise ser and potentially others won't build
+unset HOSTTYPE
+unset MACHTYPE
+unset CPU
+
 if [ "$CONFIG_CPU" != "x86_64" ]; then
     export CFLAGS="-mtune=${CONFIG_GCC_CPU} -march=${CONFIG_GCC_CPU}"
     export CXXFLAGS="$CFLAGS"
     CONF_HOST="i$CONFIG_CPU-unknown-linux-gnu"
-    export HOSTTYPE=i${CONFIG_CPU}
-    export MACHTYPE=${CONF_HOST}
-    export CPU=i${CONFIG_CPU}
 else
     export CFLAGS="-m64"
     export CXXFLAGS="$CFLAGS"
     CONF_HOST="x86_64-unknown-linux-gnu"
-    export HOSTTYPE=x86_64
-    export MACHTYPE=${CONF_HOST}
-    export CPU=x86_64
 fi
 
 PACKAGEDIR=$(find_src_dir ${0##*/})
 test -n "${PACKAGEDIR}" && cd ${PACKAGEDIR}
 
-if [ "${CONFIG_GCC_HARDENED}" = "y" ]; then
-    export CONFIG_SITE=${DL_DIR}/scripts/config/config_site.pic
-fi
+export CONFIG_SITE=${DL_DIR}/scripts/config/config_site.pic