Refactor ninja

This CL refactors ninja script to use proper binary
for specific architecture build.

Bug: http://suprem.sec.samsung.net/jira/browse/TWF-1292

Change-Id: I28f6c136a47b7334cb9f9bef7e47041fefdc7ee7
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/build/prebuild/ninja/ninja b/build/prebuild/ninja/ninja
index cab5668..882825d 100755 (executable)
--- a/build/prebuild/ninja/ninja
+++ b/build/prebuild/ninja/ninja
@@ -20,14 +20,13 @@ EOF
 
 case "$OS" in
   Linux)
+    LONG_BIT=$(getconf LONG_BIT)
     MACHINE=$(uname -m)
     case "$MACHINE" in
-      i?86|x86_64)
-        LONG_BIT=$(getconf LONG_BIT)
-        # We know we are on x86 but we need to use getconf to determine
-        # bittage of the userspace install (e.g. when runing 32-bit userspace
-        # on x86_64 kernel)
+      i?86|x86_64|aarch64)
         exec "${THIS_DIR}/ninja-linux${LONG_BIT}" "$@";;
+      armv7l)
+        exec "${THIS_DIR}/ninja-arm${LONG_BIT}" "$@";;
       *)
         echo Unknown architecture \($MACHINE\) -- unable to run ninja.
         print_help

diff --git a/build/prebuild/ninja/ninja.arm b/build/prebuild/ninja/ninja-arm32
similarity index 100%
rename from build/prebuild/ninja/ninja.arm
rename to build/prebuild/ninja/ninja-arm32

diff --git a/build/prebuild/ninja/ninja-linux32 b/build/prebuild/ninja/ninja-linux32
new file mode 100755 (executable)
index 0000000..e4be407
Binary files /dev/null and b/build/prebuild/ninja/ninja-linux32 differ

diff --git a/build/prebuild/ninja/ninja.arm64 b/build/prebuild/ninja/ninja-linux64
similarity index 100%
rename from build/prebuild/ninja/ninja.arm64
rename to build/prebuild/ninja/ninja-linux64

diff --git a/packaging/v8.spec b/packaging/v8.spec
index 7ff68f1..055e0b5 100644 (file)
--- a/packaging/v8.spec
+++ b/packaging/v8.spec
@@ -118,18 +118,11 @@ chmod 775 ./tools/clang/scripts/update.sh
     -Denable_test=0
 %endif
 
-%ifarch %{arm}
-chmod 775 ./build/prebuild/ninja/ninja.arm
-./build/prebuild/ninja/ninja.arm %{?_smp_mflags} -C%{OUTPUT_FOLDER}
-%else
-%ifarch aarch64
-chmod 775 ./build/prebuild/ninja/ninja.arm64
-./build/prebuild/ninja/ninja.arm64 %{?_smp_mflags} -C%{OUTPUT_FOLDER}
-%else
 chmod 775 ./build/prebuild/ninja/ninja
+chmod 775 ./build/prebuild/ninja/ninja-arm32
+chmod 775 ./build/prebuild/ninja/ninja-linux32
+chmod 775 ./build/prebuild/ninja/ninja-linux64
 ./build/prebuild/ninja/ninja %{?_smp_mflags} -C%{OUTPUT_FOLDER}
-%endif
-%endif
 
 %install
 install -d %{buildroot}%{_libdir}/pkgconfig