[M67 Dev][Tizen] Use system ninja
authorYoungsoo Choi <kenshin.choi@samsung.com>
Wed, 8 Mar 2017 04:31:53 +0000 (13:31 +0900)
committerYoungsoo Choi <kenshin.choi@samsung.com>
Thu, 2 Aug 2018 09:39:12 +0000 (02:39 -0700)
The chromium-efl has used prebuilt ninja in build.
This removes the prebuilt ninja and makes chromium-efl use system ninja.

Change-Id: I9af66d0843d639248ecd77da983bf6b683a4ed12
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>
packaging/chromium-efl.spec
tizen_src/build/prebuild/ninja [deleted file]
tizen_src/build/prebuild/ninja-linux32 [deleted file]
tizen_src/build/prebuild/ninja-linux64 [deleted file]
tizen_src/build/prebuild/ninja.arm [deleted file]

index 25148f0..1da60bd 100644 (file)
@@ -64,7 +64,7 @@ Requires(post): xkeyboard-config
 Requires(postun): /sbin/ldconfig
 
 BuildRequires: bison, edje-tools, expat-devel, flex, gettext, gperf, libcap-devel
-BuildRequires: libjpeg-turbo-devel, perl, python, python-xml, which
+BuildRequires: libjpeg-turbo-devel, ninja, perl, python, python-xml, which
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-location-manager)
 BuildRequires: pkgconfig(capi-media-audio-io)
@@ -353,15 +353,7 @@ fi
   -Dbuilding_for_tizen_"%{OUTPUT_BUILD_PROFILE_TARGET}"=1
 %endif
 
-%ifarch %{arm}
-tizen_src/build/prebuild/ninja.arm %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
-%else
-%ifarch aarch64
-tizen_src/build/prebuild/ninja-linux64 %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
-%else
-tizen_src/build/prebuild/ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
-%endif
-%endif
+ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
 %if 0%{?_enable_content_shell}
   content_shell \
 %endif
diff --git a/tizen_src/build/prebuild/ninja b/tizen_src/build/prebuild/ninja
deleted file mode 100755 (executable)
index cab5668..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2012 Google Inc. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-OS="$(uname -s)"
-THIS_DIR="$(dirname "${0}")"
-
-function print_help() {
-cat <<-EOF
-No prebuilt ninja binary was found for this system.
-Try building your own binary by doing:
-  cd ~
-  git clone https://github.com/martine/ninja.git -b v1.5.3
-  cd ninja && ./configure.py --bootstrap
-Then add ~/ninja/ to your PATH.
-EOF
-}
-
-case "$OS" in
-  Linux)
-    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)
-        exec "${THIS_DIR}/ninja-linux${LONG_BIT}" "$@";;
-      *)
-        echo Unknown architecture \($MACHINE\) -- unable to run ninja.
-        print_help
-        exit 1;;
-    esac
-    ;;
-  Darwin)    exec "${THIS_DIR}/ninja-mac" "$@";;
-  CYGWIN*)   exec cmd.exe /c $(cygpath -t windows $0).exe "$@";;
-  MINGW32*)  cmd.exe //c $0.exe "$@";;
-  *)         echo "Unsupported OS ${OS}"
-             print_help
-             exit 1;;
-esac
diff --git a/tizen_src/build/prebuild/ninja-linux32 b/tizen_src/build/prebuild/ninja-linux32
deleted file mode 100755 (executable)
index e4be407..0000000
Binary files a/tizen_src/build/prebuild/ninja-linux32 and /dev/null differ
diff --git a/tizen_src/build/prebuild/ninja-linux64 b/tizen_src/build/prebuild/ninja-linux64
deleted file mode 100755 (executable)
index ab58341..0000000
Binary files a/tizen_src/build/prebuild/ninja-linux64 and /dev/null differ
diff --git a/tizen_src/build/prebuild/ninja.arm b/tizen_src/build/prebuild/ninja.arm
deleted file mode 100755 (executable)
index cb4c3ec..0000000
Binary files a/tizen_src/build/prebuild/ninja.arm and /dev/null differ