From fb3ba14c3668796108c7ce9a01bc4ffc856aca50 Mon Sep 17 00:00:00 2001 From: "Dongkyun, Son" Date: Tue, 12 Jan 2016 14:13:17 +0900 Subject: [PATCH] Update Tizen:Base project configuration to apply linaro-based common toolchain. 1) rename qemu-linux-user, qemu-accel, libgcc packages 2) require gcc-c++ 3) add substitute for libgcc-32bit(for syslinux x86_64 build) Change-Id: I4719cb8052e6e95fdf73d2bb817175fd708dd31f Signed-off-by: Dongkyun, Son --- Tizen:Base/_config | 56 ++++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) mode change 100644 => 100755 Tizen:Base/_config diff --git a/Tizen:Base/_config b/Tizen:Base/_config old mode 100644 new mode 100755 index 6ee060e..946990c --- a/Tizen:Base/_config +++ b/Tizen:Base/_config @@ -1,3 +1,5 @@ +Substitute: python-accel-armv7l-cross-arm python-accel-armv7l +Substitute: python-accel-aarch64-cross-aarch64 python-accel-aarch64 ################################################################################ # OBS Project config for Tizen:Base # @@ -66,35 +68,27 @@ Target: armv7l-tizen-linux Target: aarch64-tizen-linux %endif -########## cross build ##########/ex +########## cross build ########## -%ifarch %arm armv7l +%ifarch %arm armv7l aarch64 Hostarch: x86_64 # cross build support for the build hosts -Preinstall: qemu-linux-user-cross-arm -Keep: qemu-linux-user-cross-arm -%endif - -%ifarch armv7hl -Preinstall: qemu-accel-armv7hl -Runscripts: qemu-accel-armv7hl -Preinstall: libmount libblkid libuuid +Preinstall: qemu-linux-user-cross +Runscripts: qemu-linux-user-cross +Keep: qemu-linux-user-cross %endif %ifarch armv7l -Preinstall: qemu-accel-armv7l-cross-arm -Runscripts: qemu-accel-armv7l-cross-arm +Preinstall: qemu-accel-armv7l +Runscripts: qemu-accel-armv7l Preinstall: libmount libblkid libuuid %endif %ifarch aarch64 -Hostarch: x86_64 -Preinstall: qemu-linux-user-cross-arm -Keep: qemu-linux-user-cross-arm -Preinstall: qemu-accel-aarch64-cross-aarch64 -Runscripts: qemu-accel-aarch64-cross-aarch64 +Preinstall: qemu-accel-aarch64 +Runscripts: qemu-accel-aarch64 Preinstall: libmount libblkid libuuid -%endif +%endif # aarch64 ########## exports for different architectures ########## @@ -110,7 +104,7 @@ RunScripts: setup Preinstall: bash bzip2 coreutils diffutils grep rpm Preinstall: glibc libacl libattr Preinstall: libcap -Preinstall: libgcc_s1 +Preinstall: libgcc Preinstall: libpopt sed tar zlib Preinstall: libncurses libreadline Preinstall: libelf libbz2 @@ -126,6 +120,7 @@ Preinstall: util-linux VMinstall: perl libmount libblkid libext2fs libuuid grep libpcre util-linux libsmartcols Required: binutils gcc glibc rpm-build libtool +Required: gcc-c++ Support: glibc-locale Support: perl @@ -139,14 +134,13 @@ Support: util-linux Support: less Support: which elfutils Support: update-alternatives +Support: libstdc++-devel +Support: cpp +Support: libatomic +Support: libgomp +Support: libitm - - -# FIXME: TO REMOVE (? comes from IVI) -Support: gcc-c++ - -Keep: cpp%{gcc_version} gcc%{gcc_version} gcc%{gcc_version}-ada libstdc++%{gcc_version} -Keep: libstdc++%{gcc_version}-devel gcc%{gcc_version}-c++ +Keep: libstdc++-devel Keep: cpp gcc libstdc++ Keep: pam Keep: binutils cpp libmagic-data file findutils gawk gcc gcc-c++ @@ -160,19 +154,23 @@ Keep: libcloog libppl libgmpxx Keep: nss-softokn-freebl libmagic libmagic-data Keep: setup Keep: update-alternatives -Prefer: libstdc++%{gcc_version} libgcc%{gcc_version} -Prefer: libstdc++%{gcc_version}-32bit libstdc++%{gcc_version}-64bit +Keep: cpp +Keep: gcc-c++ +Keep: libatomic +Keep: libgomp +Keep: libitm Substitute: gettext gettext-tools %ifarch x86_64 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit +Substitute: libgcc_s1-32bit libgcc-32bit %else Substitute: glibc-devel-32bit %endif ########## compilation flags ########## Optflags: armv7l -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -Wp,-D__SOFTFP__ -Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector -Wformat -Wformat-security -fmessage-length=0 -march=armv8-a+fp+simd+crc+crypto +Optflags: aarch64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector -Wformat -Wformat-security -fmessage-length=0 -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53 Optflags: i686 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer Optflags: x86_64 -O2 -g2 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -fmessage-length=0 -m64 -march=corei7 -msse4.2 -mtune=corei7-avx -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -fipa-cp-clone -- 2.7.4