From 20f2a302c0b90b2c652533b91d0b141e602635a5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Barinov Date: Mon, 19 May 2014 14:54:53 +0400 Subject: [PATCH] Tizen:Common armv7l build fix The wrong path to gcc libraries failed the build. Now spec file can detect path to gcc libraries using `gcc -v' command output Change-Id: Ic5bcdc2be9022396130d77a56ffcf1b81df25642 Signed-off-by: Vyacheslav Barinov --- packaging/gcd.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/gcd.spec b/packaging/gcd.spec index 9366b68..57d88a6 100644 --- a/packaging/gcd.spec +++ b/packaging/gcd.spec @@ -36,14 +36,14 @@ export KQUEUE_LIBS="%{_libdir}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/BlocksRuntime-0.1" export CFLAGS="$CFLAGS -L%{_builddir}/%{name}-%{version}/BlocksRuntime-0.1 -lBlocksRuntime -I%{_builddir}/%{name}-%{version}/BlocksRuntime-0.1 -Xlinker --build-id" +export COMPILER_PATH="%{_libdir}/gcc/$(gcc -v 2>&1 | grep Target | sed -e 's/.*\s//')/$(gcc -v 2>&1 | grep 'gcc version' | sed -e 's/gcc\sversion\s//;s/\.[[:digit:]]\s.*$//')" + %ifarch %{ix86} export CC="clang -target i586-tizen-linux" -export CFLAGS="$CFLAGS -Xlinker -L%{_libdir}/gcc/i586-tizen-linux/%{gcc_version}" -export COMPILER_PATH=%{_libdir}/gcc/i586-tizen-linux/%{gcc_version} +export CFLAGS="$CFLAGS -Xlinker -L$COMPILER_PATH" %else export CC="clang -target %{_target_cpu}-tizen-linux" -export CFLAGS="$CFLAGS -Xlinker -L%{_libdir}/gcc/%{_target_cpu}-tizen-linux/%{gcc_version}" -export COMPILER_PATH=%{_libdir}/gcc/%{_target_cpu}-tizen-linux/%{gcc_version} +export CFLAGS="$CFLAGS -Xlinker -L$COMPILER_PATH" %endif %configure --with-blocks-runtime=%{_libdir} @@ -85,4 +85,4 @@ done %{_includedir}/dispatch/*.h %{_libdir}/libdispatch.so %{_mandir}/man2/*.gz -%{_mandir}/man3/*.gz \ No newline at end of file +%{_mandir}/man3/*.gz -- 2.7.4