diff options
author | Youngsoo Choi <kenshin.choi@samsung.com> | 2016-05-24 14:50:41 +0900 |
---|---|---|
committer | Youngcheol Kang <ychul.kang@samsung.com> | 2016-06-03 18:02:43 +0900 |
commit | 7fc9c66bb0541882e8f5f867801f03506152d817 (patch) | |
tree | 56a9280e2f9171c392533ca432e087f9c46714c9 | |
parent | b240a1881466d88f93dacb2974c5569a3111a207 (diff) | |
download | v8-7fc9c66bb0541882e8f5f867801f03506152d817.tar.gz v8-7fc9c66bb0541882e8f5f867801f03506152d817.tar.bz2 v8-7fc9c66bb0541882e8f5f867801f03506152d817.zip |
Support obs build
The obs build for upstream does not include packaging folder in build.
So, v8.pc and v8.manifest moved to outside of packaging folder.
There's kind of bug while patching source in gbs build.
The permission of excutable binaries is getting changed to '-rw-r--r--'.
So, this CL makes them excutable by using command chmod.
The option '--incremental' is removed from gbs build in utility script file
to make same environment with obs build.
Bug: http://suprem.sec.samsung.net/jira/browse/TWF-1289
Change-Id: I2be33c2f31246f0236d6533ae86919fa1824f90c
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>
-rw-r--r-- | build/common.sh | 2 | ||||
-rw-r--r-- | build/manifest/v8.manifest (renamed from packaging/v8.manifest) | 0 | ||||
-rw-r--r-- | build/pkgconfig/v8.pc (renamed from packaging/v8.pc) | 0 | ||||
-rw-r--r-- | packaging/v8.spec | 12 |
4 files changed, 9 insertions, 5 deletions
diff --git a/build/common.sh b/build/common.sh index ad10b79cc..f743d1c57 100644 --- a/build/common.sh +++ b/build/common.sh @@ -95,7 +95,7 @@ function gbsBuildWithout500Error() { # So, temporal file is used to share build status between outer and inner while scope. while echo "0" > $SCRIPTDIR/build_result.txt - gbs $CONF_FLAG build -P $PROFILE --spec v8.spec --include-all -A $ARCHITECTURE "${ARGS[@]}" $BUILD_CONF_OPTS --incremental | \ + gbs $CONF_FLAG build -P $PROFILE --spec v8.spec --include-all -A $ARCHITECTURE "${ARGS[@]}" $BUILD_CONF_OPTS | \ while read LINE; do echo -e "$LINE" if [ "`echo "$LINE" | grep "read timeout"`" != "" ]; then diff --git a/packaging/v8.manifest b/build/manifest/v8.manifest index 41a9320fc..41a9320fc 100644 --- a/packaging/v8.manifest +++ b/build/manifest/v8.manifest diff --git a/packaging/v8.pc b/build/pkgconfig/v8.pc index 1a0fed238..1a0fed238 100644 --- a/packaging/v8.pc +++ b/build/pkgconfig/v8.pc diff --git a/packaging/v8.spec b/packaging/v8.spec index 7a9aeebfd..7ff68f10f 100644 --- a/packaging/v8.spec +++ b/packaging/v8.spec @@ -5,7 +5,6 @@ Release: 0 Group: Web Framework/Web Engine License: BSD-3-Clause Source0: %{name}-%{version}.tar.gz -Source1: v8.manifest # Conditions for OBS build # The OBS build does not support running script 'build_{target}.sh'. @@ -110,6 +109,8 @@ export GYP_GENERATOR_FLAGS="output_dir=${GYP_GENERATOR_OUTPUT}" %global OUTPUT_FOLDER %{OUTPUT_BASE_FOLDER}/Release %endif +chmod 775 ./build/gyp_v8.sh +chmod 775 ./tools/clang/scripts/update.sh ./build/gyp_v8.sh \ %if %{!?_enable_test:0}%{?_enable_test:1} -Denable_test=1 @@ -118,11 +119,14 @@ export GYP_GENERATOR_FLAGS="output_dir=${GYP_GENERATOR_OUTPUT}" %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 ./build/prebuild/ninja/ninja %{?_smp_mflags} -C%{OUTPUT_FOLDER} %endif %endif @@ -135,7 +139,7 @@ install -d %{buildroot}%{_includedir}/v8/include/libplatform install -m 0755 %{OUTPUT_FOLDER}/*.a %{buildroot}%{_libdir}/v8 install -m 0755 %{OUTPUT_FOLDER}/natives_blob.bin %{buildroot}%{_libdir}/v8 install -m 0755 %{OUTPUT_FOLDER}/snapshot_blob.bin %{buildroot}%{_libdir}/v8 -install -m 0644 ./packaging/v8.pc %{buildroot}%{_libdir}/pkgconfig/ +install -m 0644 ./build/pkgconfig/v8.pc %{buildroot}%{_libdir}/pkgconfig/ install -m 0644 ./include/*.h %{buildroot}%{_includedir}/v8/include install -m 0644 ./include/libplatform/*.h %{buildroot}%{_includedir}/v8/include/libplatform @@ -144,13 +148,13 @@ install -m 0644 ./include/libplatform/*.h %{buildroot}%{_includedir}/v8/include/ %postun -p /sbin/ldconfig %files -%manifest packaging/v8.manifest +%manifest ./build/manifest/v8.manifest %{_libdir}/v8/libv8*.a %{_libdir}/v8/natives_blob.bin %{_libdir}/v8/snapshot_blob.bin %files devel -%manifest packaging/v8.manifest +%manifest ./build/manifest/v8.manifest %{_libdir}/v8/libv8*.a %{_libdir}/v8/natives_blob.bin %{_libdir}/v8/snapshot_blob.bin |