X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fcross-armv7l-binutils-accel.spec;h=190067e0d3fdb1ca052ccb3a483dd627c2b10837;hb=b55c648ad3b92fbacef10661f8a6725e37d790a9;hp=e6f632475b0123448947056dccb1a889e40151a5;hpb=b66c47176e765afe8b67ed494e2ba1f1277fbf41;p=external%2Fbinutils.git

diff --git a/packaging/cross-armv7l-binutils-accel.spec b/packaging/cross-armv7l-binutils-accel.spec
index e6f6324..190067e 100644
--- a/packaging/cross-armv7l-binutils-accel.spec
+++ b/packaging/cross-armv7l-binutils-accel.spec
@@ -5,8 +5,12 @@
 %define accelerator_crossbuild 0
 %define disable_nls 1
 
+%ifarch x86_64
+%define x64 x64
+%endif
+
 Summary: A GNU collection of binary utilities
-Name: cross-armv7l-binutils-accel
+Name: cross-armv7l-binutils-accel-%{!?x64:x86}%{?x64}
 Version: 2.22
 Release: 1.21.Mer
 License: GPLv3+
@@ -45,10 +49,10 @@ Patch17: pr_13177.patch
 %define run_testsuite 0
 %define cross %{binutils_target}-
 # single target atm.
-ExclusiveArch: %ix86
+ExclusiveArch: %ix86 x86_64
 # special handling for Tizen ARM build acceleration
-%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)/\\1/")" == "accel"
-%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel/\\1/")-tizen-linux-gnueabi
+%if "%(echo %{name} | sed -e "s/cross-.*-binutils-\\(.*\\)-.*/\\1/")" == "accel"
+%define binutils_target %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils-accel-.*/\\1/")-tizen-linux-gnueabi
 %define _prefix /usr
 %define cross ""
 %define accelerator_crossbuild 1
@@ -161,7 +165,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2"
 # We could optimize the cross builds size by --enable-shared but the produced
 # binaries may be less convenient in the embedded environment.
 %if %{accelerator_crossbuild}
-export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linux/lib:/usr/lib:/lib"
+export CFLAGS="$CFLAGS -Wl,-rpath,/emul/ia32-linux/usr/%{_lib}:/emul/ia32-linux/%{_lib}:/usr/%{_lib}:/%{_lib}:/usr/lib:/lib"
 %endif
 %configure \
   --build=%{_target_platform} --host=%{_target_platform} \
@@ -317,6 +321,11 @@ cat %{?cross}ld.lang >> %{?cross}binutils.lang
 cat %{?cross}gprof.lang >> %{?cross}binutils.lang
 %endif
 
+%if %{accelerator_crossbuild}
+# Fixed x86 dependencies
+sed "s/@X86@/%{!?x64:x86}%{?x64}/g" -i %{_sourcedir}/baselibs.conf
+%endif
+
 %clean
 rm -rf %{buildroot}