Update build-conf for IVI branch from OBS

Change-Id: If4afcd15fc3c8518ed098679d190097ccae2bf74
Signed-off-by: Rui Lv <ruix.lv@intel.com>

diff --git a/build-arm.conf b/build-arm.conf
index ecac57caf3ad5d997013116d45feb40f10b10838..f22cfffa082a6db75014d04233dd4ad84124c3e7 100644 (file)
--- a/build-arm.conf
+++ b/build-arm.conf
@@ -31,12 +31,13 @@ Prefer: util-linux
 #Prefer: nfc-client-lib-devel
 Prefer: libtapi-devel
 
-#| wayland |  x  | meaning
-#|---------------------------
-#|   0     |  1  | pure X11 platform(no wayland)
-#|   1     |  0  | pure wayland platform (no X11)
-#|   1     |  1  | wayland but X compatibility
-#|   0     |  0  | no X and no wayland
+# | wayland |  x  | meaning
+# |----------------------------------------------------
+# |         |  1  | pure X11 platform(no wayland)
+# |   1     |     | pure wayland platform (no X11)
+# |   1     |  1  | wayland but X compatibility
+# |         |     | no X and no wayland
+# |----------------------------------------------------
 
 # mesa
 Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
@@ -69,7 +70,7 @@ Macros:
 %define _with_pulseaudio_samsung_policy 1
 %define _with_tizen 1
 %define _with_mesa 1
-%define gcc_version 48
+%define gcc_version 49
 %define profile common
 
 %ifarch i586
@@ -199,6 +200,7 @@ Macros:
 %tizen_version %{tizen_version_major}.%{tizen_version_minor}
 %tizen_full_version %{tizen_version}.%{tizen_version_patch}
 %tizen %tizen_version
+%gcc_version 49
 %_with_ivi 1
 %_with_wayland 1
 %_with_tizen 1

diff --git a/build-atom.conf b/build-atom.conf
index 87916c1f5507cb150720dbbd770661893081436e..d9e64b60b3389b2c54a67f831d3c221cfb3e9edd 100644 (file)
--- a/build-atom.conf
+++ b/build-atom.conf
@@ -31,12 +31,13 @@ Prefer: util-linux
 #Prefer: nfc-client-lib-devel
 Prefer: libtapi-devel
 
-#| wayland |  x  | meaning
-#|---------------------------
-#|   0     |  1  | pure X11 platform(no wayland)
-#|   1     |  0  | pure wayland platform (no X11)
-#|   1     |  1  | wayland but X compatibility
-#|   0     |  0  | no X and no wayland
+# | wayland |  x  | meaning
+# |----------------------------------------------------
+# |         |  1  | pure X11 platform(no wayland)
+# |   1     |     | pure wayland platform (no X11)
+# |   1     |  1  | wayland but X compatibility
+# |         |     | no X and no wayland
+# |----------------------------------------------------
 
 # mesa
 Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
@@ -69,7 +70,7 @@ Macros:
 %define _with_pulseaudio_samsung_policy 1
 %define _with_tizen 1
 %define _with_mesa 1
-%define gcc_version 48
+%define gcc_version 49
 %define profile common
 
 %ifarch i586
@@ -199,6 +200,7 @@ Macros:
 %tizen_version %{tizen_version_major}.%{tizen_version_minor}
 %tizen_full_version %{tizen_version}.%{tizen_version_patch}
 %tizen %tizen_version
+%gcc_version 49
 %_with_ivi 1
 %_with_wayland 1
 %_with_tizen 1

diff --git a/build-atom64.conf b/build-atom64.conf
index b5500284fc35844877573a84d05681ebb9556582..762eb1ba597e8a33c20f66907b8f295c554ac7c2 100644 (file)
--- a/build-atom64.conf
+++ b/build-atom64.conf
@@ -31,12 +31,13 @@ Prefer: util-linux
 #Prefer: nfc-client-lib-devel
 Prefer: libtapi-devel
 
-#| wayland |  x  | meaning
-#|---------------------------
-#|   0     |  1  | pure X11 platform(no wayland)
-#|   1     |  0  | pure wayland platform (no X11)
-#|   1     |  1  | wayland but X compatibility
-#|   0     |  0  | no X and no wayland
+# | wayland |  x  | meaning
+# |----------------------------------------------------
+# |         |  1  | pure X11 platform(no wayland)
+# |   1     |     | pure wayland platform (no X11)
+# |   1     |  1  | wayland but X compatibility
+# |         |     | no X and no wayland
+# |----------------------------------------------------
 
 # mesa
 Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
@@ -69,7 +70,7 @@ Macros:
 %define _with_pulseaudio_samsung_policy 1
 %define _with_tizen 1
 %define _with_mesa 1
-%define gcc_version 48
+%define gcc_version 49
 %define profile common
 
 %ifarch i586
@@ -199,6 +200,7 @@ Macros:
 %tizen_version %{tizen_version_major}.%{tizen_version_minor}
 %tizen_full_version %{tizen_version}.%{tizen_version_patch}
 %tizen %tizen_version
+%gcc_version 49
 %_with_ivi 1
 %_with_wayland 1
 %_with_tizen 1

diff --git a/build-emulator.conf b/build-emulator.conf
index 6577bb20bdb96ecacbc240788529a2b39e635772..5c8f4c2c605637e99df90c3c90fe6fd2bb0fe99d 100644 (file)
--- a/build-emulator.conf
+++ b/build-emulator.conf
@@ -31,12 +31,13 @@ Prefer: util-linux
 #Prefer: nfc-client-lib-devel
 Prefer: libtapi-devel
 
-#| wayland |  x  | meaning
-#|---------------------------
-#|   0     |  1  | pure X11 platform(no wayland)
-#|   1     |  0  | pure wayland platform (no X11)
-#|   1     |  1  | wayland but X compatibility
-#|   0     |  0  | no X and no wayland
+# | wayland |  x  | meaning
+# |----------------------------------------------------
+# |         |  1  | pure X11 platform(no wayland)
+# |   1     |     | pure wayland platform (no X11)
+# |   1     |  1  | wayland but X compatibility
+# |         |     | no X and no wayland
+# |----------------------------------------------------
 
 # mesa
 Substitute: pkgconfig(gles20)  pkgconfig(egl) pkgconfig(glesv2)
@@ -69,7 +70,7 @@ Macros:
 %define _with_pulseaudio_samsung_policy 1
 %define _with_tizen 1
 %define _with_mesa 1
-%define gcc_version 48
+%define gcc_version 49
 %define profile common
 
 %ifarch i586
@@ -199,6 +200,7 @@ Macros:
 %tizen_version %{tizen_version_major}.%{tizen_version_minor}
 %tizen_full_version %{tizen_version}.%{tizen_version_patch}
 %tizen %tizen_version
+%gcc_version 49
 %_with_ivi 1
 %_with_wayland 1
 %_with_tizen 1