summaryrefslogtreecommitdiff
path: root/build_tools
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2015-04-29 04:03:00 -0400
committerCorey Farrell <git@cfware.com>2015-04-29 04:03:00 -0400
commit5d997ecc83a9e20457f172b20456da40e4ca57a1 (patch)
tree0ff5760344066ad68f036bf3f2752a9c0d76dae9 /build_tools
parent2415e94b07a7ab8658fadcec93578bfd2665273c (diff)
Build System: Prevent unneeded changes to asterisk/buildopts.h.
* Add AST_DEVMODE to BUILDOPTS * Use BUILDOPTS to generate AST_BUILDOPT_SUM. * Remove loop that defined AST_MODULE_* These changes ensure that only ABI effecting options are considered for AST_BUILDOPT_SUM. This also reduces unneeded full system rebuilds caused by enabling or disabling one module that another is dependent on. ASTERISK-25028 #close Reported by: Corey Farrell Change-Id: I2c516d93df9f6aaa09ae079a8168c887a6ff93a2
Diffstat (limited to 'build_tools')
-rwxr-xr-xbuild_tools/make_buildopts_h19
1 files changed, 8 insertions, 11 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
index df506edbe..c96e50876 100755
--- a/build_tools/make_buildopts_h
+++ b/build_tools/make_buildopts_h
@@ -10,6 +10,13 @@ cat << END
*/
END
+
+if ${GREP} "AST_DEVMODE" makeopts | ${GREP} -q "yes"
+then
+ echo "#define AST_DEVMODE 1"
+ BUILDOPTS="AST_DEVMODE"
+fi
+
TMP=`${GREP} -e "^MENUSELECT_CFLAGS" menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
for x in ${TMP}; do
echo "#define ${x} 1"
@@ -33,18 +40,8 @@ for x in ${TMP}; do
BUILDOPTS="${x}"
fi
done
-TMP=`${GREP} -e "^MENUSELECT_BUILD_DEPS" menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
-for x in ${TMP}; do
- x2=`echo ${x} | tr a-z A-Z`
- echo "#define AST_MODULE_${x2} 1"
-done
-if ${GREP} "AST_DEVMODE" makeopts | ${GREP} -q "yes"
-then
- echo "#define AST_DEVMODE 1"
- TMP="${TMP} AST_DEVMODE"
-fi
-BUILDSUM=`echo ${TMP} | ${MD5} | cut -c1-32`
+BUILDSUM=`echo ${BUILDOPTS} | ${MD5} | cut -c1-32`
echo "#define AST_BUILDOPT_SUM \"${BUILDSUM}\""
echo "#define AST_BUILDOPTS \"${BUILDOPTS}\""