1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete command line args to configure

Browse Source 
Change-Id: I6b185d6e2c33ac28be302895da34123cc56b0905
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-03-20 22:35:48 +01:00
parent 84d3a21c9e
commit 921e5193cd
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configure vendored
View File

@ -664,8 +664,6 @@ CFG_CPUFEATURES=
# Host architecture, same as CFG_ARCH when not cross-compiling # Host architecture, same as CFG_ARCH when not cross-compiling
CFG_HOST_ARCH= CFG_HOST_ARCH=
CFG_HOST_CPUFEATURES= CFG_HOST_CPUFEATURES=
# Set when the -arch or -host-arch arguments are used
OPT_OBSOLETE_HOST_ARG=no
CFG_USE_GNUMAKE=no CFG_USE_GNUMAKE=no
CFG_XINPUT2=auto CFG_XINPUT2=auto
@ -690,7 +688,6 @@ CFG_KMS=auto
CFG_MIRCLIENT=auto CFG_MIRCLIENT=auto
CFG_LIBUDEV=auto CFG_LIBUDEV=auto
CFG_LIBINPUT=auto CFG_LIBINPUT=auto
CFG_OBSOLETE_WAYLAND=no
CFG_EVDEV=auto CFG_EVDEV=auto
CFG_TSLIB=auto CFG_TSLIB=auto
CFG_NIS=auto CFG_NIS=auto
@ -1290,9 +1287,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi fi
;; ;;
arch|host-arch)
OPT_OBSOLETE_HOST_ARG=yes
;;
harfbuzz) harfbuzz)
[ "$VAL" = "yes" ] && VAL=qt [ "$VAL" = "yes" ] && VAL=qt
if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
@ -1749,9 +1743,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi fi
;; ;;
wayland)
CFG_OBSOLETE_WAYLAND=yes
;;
eglfs) eglfs)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_EGLFS="$VAL" CFG_EGLFS="$VAL"
@ -7173,33 +7164,6 @@ cat <<EOF
EOF EOF
fi fi
#-------------------------------------------------------------------------------
# check if the user passed the obsoleted -wayland or -no-wayland flag
#-------------------------------------------------------------------------------
if [ "$CFG_OBSOLETE_WAYLAND" = "yes" ]; then
cat <<EOF
NOTICE: The -wayland and -no-wayland flags are now obsolete
All configuring of QtWayland plugin and QtCompositor happens in the module
EOF
fi
#-------------------------------------------------------------------------------
# check if the user passed the obsoleted -arch or -host-arch options
#-------------------------------------------------------------------------------
if [ "$OPT_OBSOLETE_HOST_ARG" = "yes" ]; then
cat <<EOF
NOTICE: The -arch and -host-arch options are obsolete.
Qt now detects the target and host architectures based on compiler
output. Qt will be built using $CFG_ARCH for the target architecture
and $CFG_HOST_ARCH for the host architecture (note that these two
will be the same unless you are cross-compiling).
EOF
fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# finally save the executed command to another script # finally save the executed command to another script
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------