From: Varinder Pratap Date: Fri, 9 Sep 2022 12:39:47 +0000 (+0530) Subject: Fixed MacOS build issue for SSL cert and disabled SDL for Ubuntu 22.04 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=293e0def90776037f65ce313f06db355cab473cc;p=sdk%2Femulator%2Fqemu.git Fixed MacOS build issue for SSL cert and disabled SDL for Ubuntu 22.04 Change-Id: I4ec8c84bd00bedc3572f4118eeb21853c43a2445 Signed-off-by: Varinder Pratap --- diff --git a/package/changelog b/package/changelog index e6c11737de..7b6f3ec280 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 5.0.1.5 +- Version Up: Fixed MacOS build and disabled SDL. +== Varinder Pratap Singh 2020-05-07 * 5.0.1.4 - Version Up: upgrade upstream qemu to 5.0.1 == Varinder Pratap Singh 2020-05-07 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index f96f111bbf..32e5f87f4c 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 5.0.1.4 +Version: 5.0.1.5 Maintainer: SeokYeon Hwang Source: emulator diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index 65ed877aef..bcdee5eac3 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -33,6 +33,10 @@ error() { exit 1 } +#this is required to avoid HTTPS SSL certificate issues in company network for submodules +git config --global http.sslVerify false + + modules="" for m in $maybe_modules do diff --git a/test_tizen_emulator.sh b/test_tizen_emulator.sh index fbb579bd6a..cbc668c4e8 100755 --- a/test_tizen_emulator.sh +++ b/test_tizen_emulator.sh @@ -5,7 +5,7 @@ test() { TIZEN_PLATFORM_VER="7.0" - QEMU_VERSION="5.0.1.3" + QEMU_VERSION="5.0.1.5" BUILD_TARGET="ubuntu-64" # emulator EMULATOR_COMMON_DIR=./package/$TIZEN_PLATFORM_VER-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-$TIZEN_PLATFORM_VER/common diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh index abad451890..d682388362 100755 --- a/tizen/emulator_configure.sh +++ b/tizen/emulator_configure.sh @@ -155,7 +155,7 @@ CONFIGURE_APPEND=" --disable-plugins --disable-modules --disable-auth-pam - --extra-cflags=-Wno-error=stringop-truncation + --disable-sdl $CONFIGURE_APPEND" CONFIGURE_APPEND_WIN=" @@ -167,12 +167,14 @@ CONFIGURE_APPEND_WIN=" --extra-cflags=-D__USE_MINGW_ANSI_STDIO=1 --extra-cflags=-Wno-error=undef --extra-cflags=-Wno-error=unknown-pragmas + --extra-cflags=-Wno-error=stringop-truncation --extra-cflags=-Wno-error=redundant-decls" # append platform specific options case $targetos in Linux*) CONFIGURE_APPEND=" + --extra-cflags=-Wno-error=stringop-truncation --extra-ldflags=-rdynamic --extra-ldflags=-Wl,-rpath,'\$\$ORIGIN' --audio-drv-list=alsa @@ -209,6 +211,7 @@ Darwin*) CONFIGURE_APPEND=" --cc=clang --cxx=clang++ + --host-cc=clang --extra-cflags=-mmacosx-version-min=10.12 --extra-cflags=-Wno-error=unknown-warning-option --extra-cflags=-Wno-error=mismatched-tags