1 files changed, 7 insertions, 78 deletions
diff --git a/build-ia32-x11.conf b/build-ia32-x11.conf
index 40f518e..0b01d99 100644
--- a/build-ia32-x11.conf
+++ b/build-ia32-x11.conf
@@ -34,12 +34,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
@@ -108,7 +102,7 @@ Macros:
 %_with_mesa 1
 :Macros
 
-%ifarch %arm armv7l %{aarch64}
+%ifarch %arm armv7l aarch64
    Substitute: mesa-devel pkgconfig(glesv2)
    #FIXME Substitute: pkgconfig(egl)
 %endif
@@ -232,9 +226,9 @@ Macros:
 
 ############################# build config #####################################
 
-%define gcc_version 48
+%define gcc_version 49
 Macros:
-%gcc_version 48
+%gcc_version 49
 :Macros
 
 ########## targets ##########
@@ -277,72 +271,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 ##########
@@ -380,9 +312,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