diff --git a/v8/v8.patch b/v8/v8.patch index 3c73653b6d..8b14ee5574 100644 --- a/v8/v8.patch +++ b/v8/v8.patch @@ -1,6 +1,6 @@ Index: build/all.gyp ---- build/all.gyp.orig 2013-10-16 12:38:50.000000000 +0200 -+++ build/all.gyp 2013-10-31 19:44:35.847786172 +0100 +--- build/all.gyp.orig 2014-06-18 16:15:57.000000000 +0200 ++++ build/all.gyp 2014-06-21 15:12:47.069066524 +0200 @@ -8,9 +8,7 @@ 'target_name': 'All', 'type': 'none', @@ -10,25 +10,48 @@ Index: build/all.gyp - '../test/cctest/cctest.gyp:*', + '../src/d8.gyp:d8' ], - } - ] + 'conditions': [ + ['component!="shared_library"', { Index: src/platform-freebsd.cc ---- src/platform-freebsd.cc.orig 2013-09-28 18:02:01.000000000 +0200 -+++ src/platform-freebsd.cc 2013-10-31 20:03:09.708026929 +0100 -@@ -182,7 +182,7 @@ - // There may be no filename in this line. Skip to next. - if (start_of_path == NULL) continue; +--- src/platform-freebsd.cc.orig 2014-06-18 16:15:57.000000000 +0200 ++++ src/platform-freebsd.cc 2014-06-21 15:32:48.169229370 +0200 +@@ -130,14 +130,14 @@ + addr_buffer[0] = '0'; + addr_buffer[1] = 'x'; + addr_buffer[10] = 0; +- int result = read(fd, addr_buffer + 2, 8); +- if (result < 8) break; ++ int len = read(fd, addr_buffer + 2, 8); ++ if (len < 8) break; + unsigned start = StringToLong(addr_buffer); +- result = read(fd, addr_buffer + 2, 1); +- if (result < 1) break; ++ len = read(fd, addr_buffer + 2, 1); ++ if (len < 1) break; + if (addr_buffer[2] != '-') break; +- result = read(fd, addr_buffer + 2, 8); +- if (result < 8) break; ++ len = read(fd, addr_buffer + 2, 8); ++ if (len < 8) break; + unsigned end = StringToLong(addr_buffer); + char buffer[MAP_LENGTH]; + int bytes_read = -1; +@@ -145,8 +145,8 @@ + bytes_read++; + if (bytes_read >= MAP_LENGTH - 1) + break; +- result = read(fd, buffer + bytes_read, 1); +- if (result < 1) break; ++ len = read(fd, buffer + bytes_read, 1); ++ if (len < 1) break; + } while (buffer[bytes_read] != '\n'); buffer[bytes_read] = 0; -- LOG(isolate SharedLibraryEvent(start_of_path, start, end)); -+ LOG(isolate, SharedLibraryEvent(start_of_path, start, end)); - } - close(fd); - } + // Ignore mappings that are not executable. Index: tools/gyp/v8.gyp ---- tools/gyp/v8.gyp.orig 2013-10-30 23:47:03.000000000 +0100 -+++ tools/gyp/v8.gyp 2013-10-31 19:44:35.847786172 +0100 -@@ -205,6 +205,9 @@ - '../../src', +--- tools/gyp/v8.gyp.orig 2014-06-18 16:15:57.000000000 +0200 ++++ tools/gyp/v8.gyp 2014-06-21 15:12:47.078872824 +0200 +@@ -247,6 +247,9 @@ + '../..', ], 'sources': [ ### gcmole(all) ### + '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', diff --git a/v8/v8.spec b/v8/v8.spec index a894e7eb5c..e9f4afba66 100644 --- a/v8/v8.spec +++ b/v8/v8.spec @@ -31,11 +31,11 @@ Distribution: OpenPKG Community Class: EVAL Group: Language License: BSD -Version: 3.22.24 -Release: 20131031 +Version: 3.27.34.4 +Release: 20140704 # list of sources -Source0: http://download.openpkg.org/components/versioned/v8/v8-%{version}.tar.bz2 +Source0: https://github.com/v8/v8/archive/%{version}.tar.gz Patch0: v8.patch # build information @@ -54,12 +54,12 @@ PreReq: libexecinfo %track prog v8 = { version = %{version} - url = http://download.openpkg.org/components/versioned/v8/ - regex = v8-(__VER__)\.tar\.bz2 + url = https://github.com/v8/v8/releases + regex = v8-(__VER__)\.tar\.gz } %prep - %setup -q -n v8 + %setup -q %patch -p0 %build @@ -78,15 +78,15 @@ PreReq: libexecinfo %install %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin \ - $RPM_BUILD_ROOT%{l_prefix}/include \ - $RPM_BUILD_ROOT%{l_prefix}/lib + $RPM_BUILD_ROOT%{l_prefix}/include/v8 \ + $RPM_BUILD_ROOT%{l_prefix}/lib/v8 %{l_shtool} install -c -s -m 755 \ out/native/d8 $RPM_BUILD_ROOT%{l_prefix}/bin/ %{l_shtool} install -c -m 644 \ - include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/ + include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/v8/ %{l_shtool} install -c -m 644 \ out/native/obj.target/tools/gyp/libv8_base*.a \ - $RPM_BUILD_ROOT%{l_prefix}/lib/libv8.a + $RPM_BUILD_ROOT%{l_prefix}/lib/v8/libv8.a %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files