AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Infer licheck bitness from platform argument

Browse Source 
We build our 32 bit Linux packages nowadays on Red Hat 64 bit with
-platform linux-g++-32. Honor this when selecting the right licheck
binary to use.

Change-Id: I08527295bc461c8cdd07e81a10c93a8f010b787d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Kai Koehne 2015-06-25 14:19:02 +02:00
parent f88f93efb6
commit 8b304ff26f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -2965,11 +2965,21 @@ if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ];
EditionString="Technology Preview" EditionString="Technology Preview"
elif [ $COMMERCIAL_USER = "yes" ]; then elif [ $COMMERCIAL_USER = "yes" ]; then
if [ $UNAME_SYSTEM = "Linux" ]; then if [ $UNAME_SYSTEM = "Linux" ]; then
case "$PLATFORM" in
*-32)
Licheck=licheck32
;;
*-64)
Licheck=licheck64
;;
*)
if file -L /bin/sh | grep -q "64-bit" ; then if file -L /bin/sh | grep -q "64-bit" ; then
Licheck=licheck64 Licheck=licheck64
else else
Licheck=licheck32 Licheck=licheck32
fi fi
;;
esac
elif [ $UNAME_SYSTEM = "Darwin" ]; then elif [ $UNAME_SYSTEM = "Darwin" ]; then
Licheck=licheck_mac Licheck=licheck_mac
else else