From 28ab6f2ca66c18ab26e2e558c8f82bf33265c9fa Mon Sep 17 00:00:00 2001
From: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
Date: Mon, 3 Nov 2014 11:30:14 +0100
Subject: [PATCH] Tizen:Common: toolchain upgrade (gcc 4.9), enable arch
 aarch64

Change-Id: I647231992d90ae995be1fe963942309193c263e8
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
---
 Tizen:Common/_config                               | 85 ++--------------------
 Tizen:Common/_meta                                 | 18 +++--
 Tizen:Common/cross-aarch64-binutils/_link          |  9 +++
 .../_link                                          |  6 +-
 .../_link                                          |  6 +-
 Tizen:Common/cross-armv7l-gcc49/_link              |  9 +++
 Tizen:Common/mic-bootstrap_aggregate/_aggregate    | 10 ++-
 Tizen:Common/mic-bootstrap_aggregate/_meta         |  2 +
 Tizen:Common/qemu-accel-aarch64/_link              |  4 +-
 Tizen:Common/qemu_aggregate/_aggregate             |  9 +++
 Tizen:Common/qemu_aggregate/_meta                  |  4 +-
 11 files changed, 66 insertions(+), 96 deletions(-)
 create mode 100644 Tizen:Common/cross-aarch64-binutils/_link
 rename Tizen:Common/{cross-armv7hl-gcc48-icecream-backend => cross-aarch64-gcc49}/_link (57%)
 rename Tizen:Common/{cross-armv7l-gcc48-icecream-backend => cross-armv7hl-gcc49}/_link (57%)
 create mode 100644 Tizen:Common/cross-armv7l-gcc49/_link

diff --git a/Tizen:Common/_config b/Tizen:Common/_config
index 227f976..9bc3924 100644
--- a/Tizen:Common/_config
+++ b/Tizen:Common/_config
@@ -17,12 +17,6 @@ Support: build
 Support: build-compare build-mkbaselibs
 Support: rpmlint-mini rpmlint-tizen
 
-%global aarch64  aarch64 arm64 armv8
-
-%ifarch ${aarch64}
-%define _arch aarch64
-%endif
-
 ############################# conflicts resolution #############################
 
 FileProvides: /usr/sbin/groupadd pwdutils
@@ -91,7 +85,7 @@ Macros:
 %_with_mesa 1
 :Macros
 
-%ifarch %arm armv7l %{aarch64}
+%ifarch %arm armv7l aarch64
    Substitute: mesa-devel pkgconfig(glesv2)
    #FIXME Substitute: pkgconfig(egl)
 %endif
@@ -215,9 +209,9 @@ Macros:
 
 ############################# build config #####################################
 
-%define gcc_version 48
+%define gcc_version 49
 Macros:
-%gcc_version 48
+%gcc_version 49
 :Macros
 
 ########## targets ##########
@@ -260,72 +254,10 @@ Preinstall: libmount libblkid libuuid
 %endif
 
 %ifarch aarch64
-Substitute: cross-aarch64-binutils  binutils
-Substitute: cross-aarch64-gcc48-icecream-backend gcc
-Preinstall: setup filesystem
-Preinstall: qemu-accel-aarch64-cross-arm
-Runscripts: qemu-accel-aarch64-cross-arm setup filesystem
-
-Preinstall: rpm rpm-build pam db4
-Preinstall: libncurses libmpc libmpfr libgmp cloog-isl
-Preinstall: python
-
-#hack to start build without proper binfmt
-Preinstall: !bbb-cross-arm
-Ignore:     bbb-cross-arm
-Preinstall: bash
-
-#provides until we can build libs correctly
-#FileProvides: libc.so.6 glibc
-#FileProvides: libc.so.6(GLIBC_2.4) glibc
-#FileProvides: libc.so.6(GLIBC_2.6) glibc
-#FileProvides: libc.so.6(GLIBC_2.7) glibc
-#FileProvides: libc.so.6(GLIBC_2.8) glibc
-#FileProvides: libc.so.6(GLIBC_2.11) glibc
-#FileProvides: libc.so.6(GLIBC_2.15) glibc
-#FileProvides: libc.so.6(GLIBC_2.17) glibc
-#FileProvides: ld-linux.so.3 glibc
-#FileProvides: ld-linux.so.3(GLIBC_2.4) glibc
-#FileProvides: ld-linux-aarch64.so.1(GLIBC_2.17)(64bit) glibc
-#FileProvides: ld-linux-aarch64.so.1()(64bit) glibc
-#FileProvides: libdl.so.2 glibc
-#FileProvides: libdl.so.2(GLIBC_2.4) glibc
-#FileProvides: libcrypt.so.1 glibc
-#FileProvides: libcrypt.so.1(GLIBC_2.4) glibc
-#FileProvides: libm.so.6 glibc
-#FileProvides: libm.so.6(GLIBC_2.4) glibc
-#FileProvides: libpthread.so.0 glibc
-#FileProvides: libpthread.so.0(GLIBC_2.4) glibc
-#FileProvides: libacl.so.1 acl
-#FileProvides: liblua.so.5.1 liblua
-#FileProvides: liblzma.so.5 xz
-#FileProvides: libpopt.so.0 popt
-#FileProvides: libelf.so.1(ELFUTILS_1.0) libelf
-#FileProvides: libnsl.so.1 glibc
-#FileProvides: libnsl.so.1(GLIBC_2.4) glibc
-#FileProvides: libutil.so.1 glibc
-#FileProvides: libutil.so.1(GLIBC_2.4) glibc
-#FileProvides: libpopt.so.0(LIBPOPT_0) popt
-#FileProvides: libacl.so.1(ACL_1.0) acl
-#FileProvides: libz.so.1(ZLIB_1.2.3.3) zlib
-#FileProvides: libmagic.so.1 libmagic
-#FileProvides: libgmp.so.10 libgmp
-#FileProvides: libmpc.so.3 libmpc
-#FileProvides: libmpfr.so.4 libmpfr
-#FileProvides: libnspr4.so nspr
-#FileProvides: libplc4.so nspr
-#FileProvides: libplds4.so nspr
-#FileProvides: libsqlite3.so.0 sqlite
-#FileProvides: libattr.so.1 attr
-#FileProvides: libattr.so.1(ATTR_1.0) attr
-#FileProvides: libsmack.so.1 smack
-#FileProvides: libsmack.so.1(LIBSMACK_1.0) smack
-#FileProvides: libxml2.so.2 libxml2
-#FileProvides: libxml2.so.2(LIBXML2_2.4.30) libxml2
-#FileProvides: libxml2.so.2(LIBXML2_2.5.0) libxml2
-#FileProvides: libxml2.so.2(LIBXML2_2.6.0) libxml2
-#FileProvides: librpm.so.3()(64bit) rpm
-#FileProvides: librpmio.so.3()(64bit) rpm
+Hostarch: x86_64
+Preinstall: qemu-accel-aarch64-cross-aarch64
+Runscripts: qemu-accel-aarch64-cross-aarch64
+Preinstall: libmount libblkid libuuid
 %endif # aarch64
 
 ########## exports for different architectures ##########
@@ -363,9 +295,6 @@ Preinstall: util-linux
 
 VMinstall: perl libmount libblkid libext2fs libuuid  grep libpcre util-linux
 
-%ifarch aarch64
-Support: cross-aarch64-binutils cross-aarch64-gcc48-icecream-backend
-%endif
 Required: binutils gcc glibc rpm-build libtool
 
 Support: glibc-locale
diff --git a/Tizen:Common/_meta b/Tizen:Common/_meta
index b65054f..6fb28fc 100644
--- a/Tizen:Common/_meta
+++ b/Tizen:Common/_meta
@@ -10,20 +10,17 @@
     <disable arch="i586" repository="arm-wayland"/>
     <disable arch="x86_64" repository="arm-wayland"/>
     <disable arch="i586" repository="x86_64-wayland"/>
-    <disable repository="arm64-wayland"/>
     <disable arch="i586" repository="x86_64-x11"/>
     <disable arch="i586" repository="arm-x11"/>
     <disable arch="x86_64" repository="arm-x11"/>
+    <disable arch="i586" repository="arm64-wayland"/>
+    <disable arch="x86_64" repository="arm64-wayland"/>
+    <disable arch="x86_64" repository="arm64-x11"/>
+    <disable arch="i586" repository="arm64-x11"/>
   </build>
-  <publish>
-    <disable repository="arm64-wayland"/>
-  </publish>
   <debuginfo>
     <enable/>
   </debuginfo>
-  <useforbuild>
-    <disable repository="arm64-wayland"/>
-  </useforbuild>
   <repository name="x86_64-x11">
     <arch>x86_64</arch>
     <arch>i586</arch>
@@ -41,8 +38,15 @@
   <repository name="emulator32-wayland">
     <arch>i586</arch>
   </repository>
+  <repository name="arm64-x11">
+    <arch>aarch64</arch>
+    <arch>i586</arch>
+    <arch>x86_64</arch>
+  </repository>
   <repository name="arm64-wayland">
     <arch>aarch64</arch>
+    <arch>i586</arch>
+    <arch>x86_64</arch>
   </repository>
   <repository name="arm-x11">
     <arch>armv7l</arch>
diff --git a/Tizen:Common/cross-aarch64-binutils/_link b/Tizen:Common/cross-aarch64-binutils/_link
new file mode 100644
index 0000000..64cc838
--- /dev/null
+++ b/Tizen:Common/cross-aarch64-binutils/_link
@@ -0,0 +1,9 @@
+<link  package="binutils" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete name="filename" /> delete a file -->
+</patches>
+</link>
diff --git a/Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link b/Tizen:Common/cross-aarch64-gcc49/_link
similarity index 57%
rename from Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link
rename to Tizen:Common/cross-aarch64-gcc49/_link
index da79960..a246210 100644
--- a/Tizen:Common/cross-armv7hl-gcc48-icecream-backend/_link
+++ b/Tizen:Common/cross-aarch64-gcc49/_link
@@ -1,9 +1,9 @@
-<link  package="gcc48" cicount="copy">
+<link  package="gcc49" cicount="copy">
 <patches>
   <!-- <branch /> for a full copy, default case  -->
   <!-- <apply name="patch" /> apply a patch on the source directory  -->
   <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete>filename</delete> delete a file -->
+  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete name="filename" /> delete a file -->
 </patches>
 </link>
diff --git a/Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link b/Tizen:Common/cross-armv7hl-gcc49/_link
similarity index 57%
rename from Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link
rename to Tizen:Common/cross-armv7hl-gcc49/_link
index da79960..a246210 100644
--- a/Tizen:Common/cross-armv7l-gcc48-icecream-backend/_link
+++ b/Tizen:Common/cross-armv7hl-gcc49/_link
@@ -1,9 +1,9 @@
-<link  package="gcc48" cicount="copy">
+<link  package="gcc49" cicount="copy">
 <patches>
   <!-- <branch /> for a full copy, default case  -->
   <!-- <apply name="patch" /> apply a patch on the source directory  -->
   <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete>filename</delete> delete a file -->
+  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete name="filename" /> delete a file -->
 </patches>
 </link>
diff --git a/Tizen:Common/cross-armv7l-gcc49/_link b/Tizen:Common/cross-armv7l-gcc49/_link
new file mode 100644
index 0000000..a246210
--- /dev/null
+++ b/Tizen:Common/cross-armv7l-gcc49/_link
@@ -0,0 +1,9 @@
+<link  package="gcc49" cicount="copy">
+<patches>
+  <!-- <branch /> for a full copy, default case  -->
+  <!-- <apply name="patch" /> apply a patch on the source directory  -->
+  <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
+  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete name="filename" /> delete a file -->
+</patches>
+</link>
diff --git a/Tizen:Common/mic-bootstrap_aggregate/_aggregate b/Tizen:Common/mic-bootstrap_aggregate/_aggregate
index 987cc76..f7b8a03 100644
--- a/Tizen:Common/mic-bootstrap_aggregate/_aggregate
+++ b/Tizen:Common/mic-bootstrap_aggregate/_aggregate
@@ -4,5 +4,11 @@
     <binary>mic-bootstrap-x86-arm</binary>
     <repository source="ia32-wayland" target="arm-wayland"/>
     <repository source="ia32-x11" target="arm-x11"/>
-    </aggregate>         
-</aggregatelist>
\ No newline at end of file
+  </aggregate>
+  <aggregate project="Tizen:Common">
+    <package>mic-bootstrap</package>
+    <binary>mic-bootstrap-x86-arm</binary>
+    <repository source="x86_64-wayland" target="arm64-wayland"/>
+    <repository source="x86_64-wayland" target="arm64-x11"/>
+   </aggregate>
+</aggregatelist>
diff --git a/Tizen:Common/mic-bootstrap_aggregate/_meta b/Tizen:Common/mic-bootstrap_aggregate/_meta
index ce9b140..a248a7d 100644
--- a/Tizen:Common/mic-bootstrap_aggregate/_meta
+++ b/Tizen:Common/mic-bootstrap_aggregate/_meta
@@ -4,6 +4,8 @@
   <build>
     <enable arch="i586" repository="arm-wayland"/>
     <enable arch="i586" repository="arm-x11"/>
+    <enable arch="x86_64" repository="arm64-wayland"/>
+    <enable arch="x86_64" repository="arm64-x11"/>
     <disable/>
   </build>
 </package>
diff --git a/Tizen:Common/qemu-accel-aarch64/_link b/Tizen:Common/qemu-accel-aarch64/_link
index 906ab97..5571e3f 100644
--- a/Tizen:Common/qemu-accel-aarch64/_link
+++ b/Tizen:Common/qemu-accel-aarch64/_link
@@ -3,7 +3,7 @@
   <!-- <branch /> for a full copy, default case  -->
   <!-- <apply name="patch" /> apply a patch on the source directory  -->
   <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top (spec file only) -->
-  <!-- <add>file.patch</add> add a patch to be applied after %setup (spec file only) -->
-  <!-- <delete>filename</delete> delete a file -->
+  <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec file only) -->
+  <!-- <delete name="filename" /> delete a file -->
 </patches>
 </link>
diff --git a/Tizen:Common/qemu_aggregate/_aggregate b/Tizen:Common/qemu_aggregate/_aggregate
index 3258fbf..a4d04bb 100644
--- a/Tizen:Common/qemu_aggregate/_aggregate
+++ b/Tizen:Common/qemu_aggregate/_aggregate
@@ -4,6 +4,8 @@
     <binary>qemu-linux-user-cross-arm</binary>
     <repository source="ia32-wayland" target="arm-wayland"/>
     <repository source="ia32-x11" target="arm-x11"/>
+    <repository source="x86_64-wayland" target="arm64-wayland"/>
+    <repository source="x86_64-wayland" target="arm64-x11"/>
   </aggregate>
   <aggregate project="Tizen:Common" >
     <package>qemu-accel-armv7l</package>
@@ -12,4 +14,11 @@
     <repository source="ia32-wayland" target="arm-wayland"/>
     <repository source="ia32-x11" target="arm-x11"/>
   </aggregate>
+  <aggregate project="Tizen:Common" >
+    <package>qemu-accel-aarch64</package>
+    <binary>qemu-accel-aarch64</binary>
+    <binary>qemu-accel-aarch64-cross-aarch64</binary>
+    <repository source="x86_64-wayland" target="arm64-wayland"/>
+    <repository source="x86_64-wayland" target="arm64-x11"/>
+    </aggregate>
 </aggregatelist>
\ No newline at end of file
diff --git a/Tizen:Common/qemu_aggregate/_meta b/Tizen:Common/qemu_aggregate/_meta
index 8031d27..cc3193b 100644
--- a/Tizen:Common/qemu_aggregate/_meta
+++ b/Tizen:Common/qemu_aggregate/_meta
@@ -3,7 +3,9 @@
   <description/>
   <build>
     <disable/>
-    <enable arch="i586" repository="arm-wayland"/>
+    <enable arch="x86_64" repository="arm64-x11"/>
+    <enable arch="x86_64" repository="arm64-wayland"/>
     <enable arch="i586" repository="arm-x11"/>
+    <enable arch="i586" repository="arm-wayland"/>
   </build>
 </package>
-- 
2.7.4