packages: v8/v8.spec, v8/v8-cstdio.patch (NEW), v8/v8-strndup.patch (NEW) -...

[aredridel]

Author: aredridel                    Date: Wed Mar 10 04:22:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to r4070 / 2.0.6+
- fix minor type mismatch
- patch for older libstdc++ lack of cstdio
- build on Ac with GCC4

---- Files affected:
packages/v8:
   v8.spec (1.7 -> 1.8) , v8-cstdio.patch (NONE -> 1.1)  (NEW), v8-strndup.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/v8/v8.spec
diff -u packages/v8/v8.spec:1.7 packages/v8/v8.spec:1.8
--- packages/v8/v8.spec:1.7	Wed Dec  2 08:12:43 2009
+++ packages/v8/v8.spec	Wed Mar 10 05:22:44 2010
@@ -1,20 +1,17 @@
 # $Revision$, $Date$
-# TODO
-# - cxx is not passed to build
-# - cleaner way for cxxflags
 
 # For the 1.2 branch, we use 0s here
 # For 1.3+, we use the three digit versions
 %define		somajor 2
 %define		sominor 0
-%define		sobuild 0
+%define		sobuild 6
 %define		sover %{somajor}.%{sominor}.%{sobuild}
 
-%define		snap	20091118svn3334
+%define		snap	20100309svn4070
 %define		rel		1
 Summary:	JavaScript Engine
 Name:		v8
-Version:	2.0.0
+Version:	2.0.6
 Release:	0.%{snap}.%{rel}
 License:	BSD
 Group:		Libraries
@@ -22,9 +19,12 @@
 # No tarballs, pulled from svn
 # svn export http://v8.googlecode.com/svn/trunk/ v8
 Source0:	%{name}-%{snap}.tar.bz2
-# Source0-md5:	014dd59b50b7859f3845b535ebd06ad2
-Patch0:		%{name}-d8-fwrite-return.patch
+# Source0-md5:	f329539eacdd444b2517ff66561ab0fe
+#Patch0:		%{name}-d8-fwrite-return.patch
 Patch1:		%{name}-2.0.0-d8-allocation.patch
+Patch2:		%{name}-cstdio.patch
+Patch3:		%{name}-strndup.patch
+BuildRequires:	gcc >= 4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	readline-devel
 BuildRequires:	scons
@@ -60,8 +60,10 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %{__sed} -i -e "s,'-O3','%{rpmcxxflags}'.split(' ')," SConstruct
 
 # create simple makefile
@@ -75,6 +77,18 @@
 
 %build
 # build library
+
+CFLAGS="%{rpmcflags}"
+CXXFLAGS="%{rpmcxxflags}"
+LDFLAGS="%{rpmcflags}"
+%if "%{pld_release}" == "ac"
+CC=%{__cc}4
+CXX=%{__cxx}4
+%else
+CC=%{__cc}
+CXX=%{__cxx}
+%endif
+export CFLAGS LDFLAGS CXXFLAGS CC CXX
 %scons \
 	library=shared \
 	snapshots=on \
@@ -158,6 +172,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2010/03/10 04:22:44  aredridel
+- up to r4070 / 2.0.6+
+- fix minor type mismatch
+- patch for older libstdc++ lack of cstdio
+- build on Ac with GCC4
+
 Revision 1.7  2009/12/02 07:12:43  glen
 - libs split; rel 1
 

================================================================
Index: packages/v8/v8-cstdio.patch
diff -u /dev/null packages/v8/v8-cstdio.patch:1.1
--- /dev/null	Wed Mar 10 05:22:50 2010
+++ packages/v8/v8-cstdio.patch	Wed Mar 10 05:22:44 2010
@@ -0,0 +1,12 @@
+diff -ur v8-/src/d8-readline.cc v8/src/d8-readline.cc
+--- v8-/src/d8-readline.cc	2010-03-09 20:28:47.000000000 -0700
++++ v8/src/d8-readline.cc	2010-03-09 20:52:00.000000000 -0700
+@@ -26,7 +26,7 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ 
+-#include <cstdio>  // NOLINT
++#include <stdio.h>  // NOLINT
+ #include <readline/readline.h> // NOLINT
+ #include <readline/history.h> // NOLINT
+ 

================================================================
Index: packages/v8/v8-strndup.patch
diff -u /dev/null packages/v8/v8-strndup.patch:1.1
--- /dev/null	Wed Mar 10 05:22:50 2010
+++ packages/v8/v8-strndup.patch	Wed Mar 10 05:22:44 2010
@@ -0,0 +1,12 @@
+diff -ur v8-/src/allocation.h v8/src/allocation.h
+--- v8-/src/allocation.h	2010-03-09 20:28:45.000000000 -0700
++++ v8/src/allocation.h	2010-03-09 21:07:04.000000000 -0700
+@@ -124,7 +124,7 @@
+ // and StrNDup uses new and calls the FatalProcessOutOfMemory handler
+ // if allocation fails.
+ char* StrDup(const char* str);
+-char* StrNDup(const char* str, int n);
++char* StrNDup(const char* str, size_t n);
+ 
+ 
+ // Allocation policy for allocating in the C free store using malloc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/v8/v8.spec?r1=1.7&r2=1.8&f=u