123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310 |
- Subject: byacc: do not reorder $CC and $CFLAGS
- byacc tries to process $CC and decide which part should belong to CC and which
- part should below to CFLAGS and then do reordering. It doesn't make much sense
- for OE. And it doesn't do its work correctly. Some options are dropped.
- Delete all these stuff so that we could have all options we need.
- Upstream-Status: Inappropriate [OE Specific]
- Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
- Update for 20190617.
- Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
- Update for 20191103.
- Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
- Update for 20200910.
- Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
- ---
- aclocal.m4 | 1 -
- configure | 259 -----------------------------------------------------
- 2 files changed, 260 deletions(-)
- diff --git a/aclocal.m4 b/aclocal.m4
- index 1c6a3ee..2f7e9b5 100644
- --- a/aclocal.m4
- +++ b/aclocal.m4
- @@ -1317,7 +1317,6 @@ CF_GCC_VERSION
- CF_ACVERSION_CHECK(2.52,
- [AC_PROG_CC_STDC],
- [CF_ANSI_CC_REQD])
- -CF_CC_ENV_FLAGS
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
- diff --git a/configure b/configure
- index 378f27d..8f40229 100755
- --- a/configure
- +++ b/configure
- @@ -2066,265 +2066,6 @@ esac
- # This should have been defined by AC_PROG_CC
- : ${CC:=cc}
-
- -echo "$as_me:2069: checking \$CFLAGS variable" >&5
- -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
- -case "x$CFLAGS" in
- -(*-[IUD]*)
- - echo "$as_me:2073: result: broken" >&5
- -echo "${ECHO_T}broken" >&6
- - { echo "$as_me:2075: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
- -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
- - cf_flags="$CFLAGS"
- - CFLAGS=
- - for cf_arg in $cf_flags
- - do
- -
- -cf_fix_cppflags=no
- -cf_new_cflags=
- -cf_new_cppflags=
- -cf_new_extra_cppflags=
- -
- -for cf_add_cflags in $cf_arg
- -do
- -case $cf_fix_cppflags in
- -(no)
- - case $cf_add_cflags in
- - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
- - case $cf_add_cflags in
- - (-D*)
- - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
- -
- - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- - && test -z "${cf_tst_cflags}" \
- - && cf_fix_cppflags=yes
- -
- - if test $cf_fix_cppflags = yes ; then
- -
- - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
- -
- - continue
- - elif test "${cf_tst_cflags}" = "\"'" ; then
- -
- - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
- -
- - continue
- - fi
- - ;;
- - esac
- - case "$CPPFLAGS" in
- - (*$cf_add_cflags)
- - ;;
- - (*)
- - case $cf_add_cflags in
- - (-D*)
- - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
- -
- -CPPFLAGS=`echo "$CPPFLAGS" | \
- - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
- - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
- -
- - ;;
- - esac
- -
- - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
- - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
- -
- - ;;
- - esac
- - ;;
- - (*)
- -
- - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
- - cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
- -
- - ;;
- - esac
- - ;;
- -(yes)
- -
- - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
- -
- - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- -
- - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- - && test -z "${cf_tst_cflags}" \
- - && cf_fix_cppflags=no
- - ;;
- -esac
- -done
- -
- -if test -n "$cf_new_cflags" ; then
- -
- - test -n "$CFLAGS" && CFLAGS="$CFLAGS "
- - CFLAGS="${CFLAGS}$cf_new_cflags"
- -
- -fi
- -
- -if test -n "$cf_new_cppflags" ; then
- -
- - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
- -
- -fi
- -
- -if test -n "$cf_new_extra_cppflags" ; then
- -
- - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
- - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
- -
- -fi
- -
- - done
- - ;;
- -(*)
- - echo "$as_me:2183: result: ok" >&5
- -echo "${ECHO_T}ok" >&6
- - ;;
- -esac
- -
- -echo "$as_me:2188: checking \$CC variable" >&5
- -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
- -case "$CC" in
- -(*[\ \ ]-*)
- - echo "$as_me:2192: result: broken" >&5
- -echo "${ECHO_T}broken" >&6
- - { echo "$as_me:2194: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
- -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
- - # humor him...
- - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
- - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
- - CC="$cf_prog"
- - for cf_arg in $cf_flags
- - do
- - case "x$cf_arg" in
- - (x-[IUDfgOW]*)
- -
- -cf_fix_cppflags=no
- -cf_new_cflags=
- -cf_new_cppflags=
- -cf_new_extra_cppflags=
- -
- -for cf_add_cflags in $cf_arg
- -do
- -case $cf_fix_cppflags in
- -(no)
- - case $cf_add_cflags in
- - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
- - case $cf_add_cflags in
- - (-D*)
- - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
- -
- - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- - && test -z "${cf_tst_cflags}" \
- - && cf_fix_cppflags=yes
- -
- - if test $cf_fix_cppflags = yes ; then
- -
- - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
- -
- - continue
- - elif test "${cf_tst_cflags}" = "\"'" ; then
- -
- - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
- -
- - continue
- - fi
- - ;;
- - esac
- - case "$CPPFLAGS" in
- - (*$cf_add_cflags)
- - ;;
- - (*)
- - case $cf_add_cflags in
- - (-D*)
- - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
- -
- -CPPFLAGS=`echo "$CPPFLAGS" | \
- - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \
- - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'`
- -
- - ;;
- - esac
- -
- - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
- - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
- -
- - ;;
- - esac
- - ;;
- - (*)
- -
- - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
- - cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
- -
- - ;;
- - esac
- - ;;
- -(yes)
- -
- - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
- - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
- -
- - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- -
- - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
- - && test -z "${cf_tst_cflags}" \
- - && cf_fix_cppflags=no
- - ;;
- -esac
- -done
- -
- -if test -n "$cf_new_cflags" ; then
- -
- - test -n "$CFLAGS" && CFLAGS="$CFLAGS "
- - CFLAGS="${CFLAGS}$cf_new_cflags"
- -
- -fi
- -
- -if test -n "$cf_new_cppflags" ; then
- -
- - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
- - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
- -
- -fi
- -
- -if test -n "$cf_new_extra_cppflags" ; then
- -
- - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
- - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
- -
- -fi
- -
- - ;;
- - (*)
- - CC="$CC $cf_arg"
- - ;;
- - esac
- - done
- - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6
- -
- -echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5
- -
- - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
- -
- -echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
- -
- - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
- -
- -echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
- -
- - ;;
- -(*)
- - echo "$as_me:2323: result: ok" >&5
- -echo "${ECHO_T}ok" >&6
- - ;;
- -esac
- -
- echo "$as_me:2328: checking whether ${MAKE-make} sets \${MAKE}" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- --
- 2.25.1
|