From d5a9c4971813a08e1d9ce06b4822019c597ba04b Mon Sep 17 00:00:00 2001
From: Jinhyung Jo <jinhyung.jo@samsung.com>
Date: Thu, 1 Jun 2017 20:50:28 +0900
Subject: [PATCH] configure: modify configure for recent macOS

Change-Id: I8fb928f2de4f7168b27faedac02a0d2c37585666
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
(cherry picked from commit 67ddd95f1039d5b44e2db1304c3580386e0236ab)
---
 configure                       | 15 ++++++++++-----
 tizen/emulator_configure.sh     |  8 ++++++--
 tizen/src/skin/client/build.xml |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index a4facfd0fc..6ab98434a8 100755
--- a/configure
+++ b/configure
@@ -49,6 +49,7 @@ do_compiler() {
     shift
     echo $compiler "$@" >> config.log
     $compiler "$@" >> config.log 2>&1 || return $?
+
     # Test passed. If this is an --enable-werror build, rerun
     # the test with -Werror and bail out if it fails. This
     # makes warning-generating-errors in configure test code
@@ -63,11 +64,15 @@ do_compiler() {
         ;;
     esac
     echo $compiler -Werror "$@" >> config.log
-    $compiler -Werror "$@" >> config.log 2>&1 && return $?
-    error_exit "configure test passed without -Werror but failed with -Werror." \
-        "This is probably a bug in the configure script. The failing command" \
-        "will be at the bottom of config.log." \
-        "You can run configure with --disable-werror to bypass this check."
+#   Modified - it produces confusable result with clang.
+#   We use -Werror for all platforms. So, simply, we just return result.
+    $compiler -Werror "$@" >> config.log 2>&1
+    return $?
+#   $compiler -Werror "$@" >> config.log 2>&1 && return $?
+#   error_exit "configure test passed without -Werror but failed with -Werror." \
+#       "This is probably a bug in the configure script. The failing command" \
+#       "will be at the bottom of config.log." \
+#       "You can run configure with --disable-werror to bypass this check."
 }
 
 do_cc() {
diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index df17a03ac5..bd2fcfb999 100755
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -232,9 +232,13 @@ echo ""
 echo "##### QEMU configuring for emulator"
 echo "##### QEMU configure append:" $CONFIGURE_APPEND
 ./configure \
+ --cc=clang \
+ --cxx=clang++ \
  --enable-werror \
- --extra-cflags=-mmacosx-version-min=10.7 \
- --extra-cflags=-Wno-deprecated-declarations \
+ --extra-cflags=-mmacosx-version-min=10.9 \
+ --extra-cflags=-Wno-error=deprecated-declarations \
+ --extra-cflags=-Wno-error=address-of-packed-member \
+ --extra-cflags=-Wno-error=constant-conversion \
  --audio-drv-list=coreaudio \
  --enable-shm \
  --enable-hax \
diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 2a7124fd84..977ca858e7 100644
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -124,7 +124,7 @@
 			<class name="org.tizen.emulator.skin.EmulatorShmSkin" />
 		</javah>
 		<exec dir="native_src" executable="cc" failifexecutionfails="false">
-			<arg line="-mmacosx-version-min=10.4" />
+			<arg line="-mmacosx-version-min=10.9" />
 			<arg line="-c" />
 			<arg line="share.c" />
 			<arg line="-o" />
-- 
2.34.1