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>
|
|
Update for 20210808.
|
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
---
|
aclocal.m4 | 1 -
|
configure | 259 -----------------------------------------------------
|
2 files changed, 260 deletions(-)
|
|
diff --git a/aclocal.m4 b/aclocal.m4
|
index 7a9a8fb..108b6cc 100644
|
--- a/aclocal.m4
|
+++ b/aclocal.m4
|
@@ -1401,7 +1401,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 5b98a03..e3a4237 100755
|
--- a/configure
|
+++ b/configure
|
@@ -2146,265 +2146,6 @@ esac
|
# This should have been defined by AC_PROG_CC
|
: "${CC:=cc}"
|
|
-echo "$as_me:2149: checking \$CFLAGS variable" >&5
|
-echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
|
-case "x$CFLAGS" in
|
-(*-[IUD]*)
|
- echo "$as_me:2153: result: broken" >&5
|
-echo "${ECHO_T}broken" >&6
|
- { echo "$as_me:2155: 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:2263: result: ok" >&5
|
-echo "${ECHO_T}ok" >&6
|
- ;;
|
-esac
|
-
|
-echo "$as_me:2268: checking \$CC variable" >&5
|
-echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
|
-case "$CC" in
|
-(*[\ \ ]-*)
|
- echo "$as_me:2272: result: broken" >&5
|
-echo "${ECHO_T}broken" >&6
|
- { echo "$as_me:2274: 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}:2391: testing resulting CC: '$CC' ..." 1>&5
|
-
|
- test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6
|
-
|
-echo "${as_me:-configure}:2395: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
|
-
|
- test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
|
-
|
-echo "${as_me:-configure}:2399: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
|
-
|
- ;;
|
-(*)
|
- echo "$as_me:2403: result: ok" >&5
|
-echo "${ECHO_T}ok" >&6
|
- ;;
|
-esac
|
-
|
echo "$as_me:2408: 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
|
