devel/js js-va_copy.patch,NONE,1.1 js.spec,1.2,1.3

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/devel/js
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12830

Modified Files:
	js.spec 
Added Files:
	js-va_copy.patch 
Log Message:
Add js-va_copy.patch to fix x86_64; Patch was found in a Mandrake srpm

js-va_copy.patch:

--- NEW FILE js-va_copy.patch ---
--- js/src/config/Linux_All.mk.va_copy	2003-05-15 20:21:08.000000000 -0400
+++ js/src/config/Linux_All.mk	2004-09-29 16:19:38.478184537 -0400
@@ -86,8 +86,12 @@ endif
 JS_EDITLINE = 1
 
 ifeq ($(CPU_ARCH),x86_64)
-# Use VA_COPY() standard macro on x86-64
-# FIXME: better use it everywhere
+# Use va_copy() standard macro on x86-64
+OS_CFLAGS += -DHAVE_VA_COPY
+endif
+
+ifeq ($(CPU_ARCH),ppc)
+# Use va_copy() standard macro on ppc too
 OS_CFLAGS += -DHAVE_VA_COPY
 endif
 
--- js/src/jsprf.c.va_copy	2003-02-23 01:59:13.000000000 -0500
+++ js/src/jsprf.c	2004-09-29 16:21:06.093858503 -0400
@@ -51,7 +51,7 @@
 ** and requires array notation.
 */
 #ifdef HAVE_VA_COPY
-#define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
+#define VARARGS_ASSIGN(foo, bar)        va_copy(foo,bar)
 #elif defined(HAVE_VA_LIST_AS_ARRAY)
 #define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
 #else


Index: js.spec
===================================================================
RCS file: /cvs/extras/devel/js/js.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- js.spec	14 Dec 2004 23:04:32 -0000	1.2
+++ js.spec	13 Feb 2005 18:22:56 -0000	1.3
@@ -5,7 +5,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 0.rc6a.2
+Release: 0.rc6a.3
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -17,6 +17,7 @@
 Patch0: js-make.patch
 Patch1: js-shlib.patch
 Patch2: js-perlconnect.patch
+Patch3: js-va_copy.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl >= 1:5.6.1 readline-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -43,6 +44,9 @@
 %patch0 -b .make
 %patch1 -b .shlib
 %patch2 -b .perl
+%ifarch x86_64
+%patch3 -p 1 -b .vacopy
+%endif
 cp src/perlconnect/README.html src/README.perlconnect.html
 
 %build
@@ -103,6 +107,9 @@
 %{_includedir}/js*.h
 
 %changelog
+* Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 1.5-0.rc6a.3
+- Add js-va_copy.patch to fix x86_64; Patch was found in a Mandrake srpm
+
 * Sat Dec 11 2004 Ville Skyttä <ville.skytta at iki.fi> - 1.5-0.rc6a.2
 - Include perlconnect.
 - Include readline support, rebuild using "--without readline" to disable.