Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv445
Modified Files:
macstl.info macstl.patch
Log Message:
patched for i386/x86_64 (validated)
Index: macstl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/macstl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- macstl.patch 18 Apr 2010 21:07:11 -0000 1.1
+++ macstl.patch 18 Apr 2010 22:27:08 -0000 1.2
@@ -1,9 +1,20 @@
+diff -ur macstl-orig/unix/Makefile macstl/unix/Makefile
--- macstl-orig/unix/Makefile 2010-04-18 13:11:50.000000000 -0700
+++ macstl/unix/Makefile 2010-04-18 13:20:46.000000000 -0700
-@@ -17,11 +17,14 @@
- COMMON_OPT = -march=pentium4 -mfpmath=sse -O3 -static -lstdc++ -lm
+@@ -11,17 +12,22 @@
+ endif
+
+ ifeq ($(PLATFORM), PPC)
+-COMMON_OPT = -maltivec -O3 -static -lstdc++ -lm
++COMMON_OPT = -maltivec -O3
+ else
+ ifeq ($(PLATFORM), x86)
+-COMMON_OPT = -march=pentium4 -mfpmath=sse -O3 -static -lstdc++ -lm
++COMMON_OPT = -mfpmath=sse -O3
++# patch: let compiler_wrapper set -arch to i386 or x86_64
endif
endif
++# COMMON_OPT += -static -lstdc++ -lm
+# patch: paranoid check standard conformance and cleanliness
+COMMON_OPT += -Wall -W -Werror -ansi -pedantic-errors -Wno-long-long
@@ -16,3 +27,102 @@
mmaptest : ../test/mmaptest.cpp
$(CC) $(COMMON_OPT) -I$(MACSTL_DIR) $< -o $@
+diff -ur macstl-orig/macstl/impl/vec_mmx.h macstl/macstl/impl/vec_mmx.h
+--- macstl-orig/macstl/impl/vec_mmx.h 2005-09-04 08:15:33.000000000 -0700
++++ macstl/macstl/impl/vec_mmx.h 2010-04-18 14:47:30.000000000 -0700
+@@ -290,7 +290,7 @@
+
__m64 vec;
+ };
+
+- static const
union_type un = {v0, v1};
++ static const
union_type un = {{v0, v1}};
+ return un.vec;
+ }
+ };
+@@ -319,7 +319,7 @@
+
__m128 vec;
+ };
+
+- static const
union_type un = {v0, v1, v2, v3};
++ static const
union_type un = {{v0, v1, v2, v3}};
+ return un.vec;
+ }
+ };
+@@ -349,7 +349,7 @@
+
__m128d vec;
+ };
+
+- static const
union_type un = {v0, v1, v2, v3};
++ static const
union_type un = {{v0, v1, v2, v3}};
+ return un.vec;
+ }
+ };
+@@ -372,7 +372,7 @@
+
__m128i vec;
+ };
+
+- static const
union_type un = {v0, v1, v2, v3};
++ static const
union_type un = {{v0, v1, v2, v3}};
+ return un.vec;
+ }
+ };
+@@ -1607,7 +1607,7 @@
+ static INLINE const vec set (
+ value_type v0, value_type v1)
+ {
+- union_type un = {v0,
v1};
++ union_type un = {{v0,
v1}};
+ return un.vec;
+ }
+
+@@ -1663,7 +1663,7 @@
+ static INLINE const vec set (
+ value_type v0, value_type v1)
+ {
+- union_type un = {v0,
v1};
++ union_type un = {{v0,
v1}};
+ return un.vec;
+ }
+
+@@ -1719,7 +1719,7 @@
+ static INLINE const vec set (
+ value_type v0, value_type v1)
+ {
+- union_type un =
{v0.data (), v1.data ()};
++ union_type un =
{{v0.data (), v1.data ()}};
+ return un.vec;
+ }
+
+@@ -2775,7 +2775,9 @@
+
+ DEFINE_MMX_UNARY_FUNCTION_WITH_LITERAL (srai,
_mm_srai_epi16, M128I_I16, M128I_I16)
+ DEFINE_MMX_UNARY_FUNCTION_WITH_LITERAL (srai,
_mm_srai_epi32, M128I_I32, M128I_I32)
++#if 0 && defined(__x86_64__)
+ DEFINE_MMX_UNARY_FUNCTION_WITH_LITERAL (srai,
_mm_srai_epi64, M128I_I64, M128I_I64)
++#endif
+
+ DEFINE_MMX_BINARY_FUNCTION (srl, _mm_srl_epi16,
M128I_I16, M128I_U16, M128I_I16)
+ DEFINE_MMX_BINARY_FUNCTION (srl, _mm_srl_epi16,
M128I_U16, M128I_U16, M128I_U16)
+diff -ur macstl-orig/macstl/vec.h macstl/macstl/vec.h
+--- macstl-orig/macstl/vec.h 2005-08-17 08:15:28.000000000 -0700
++++ macstl/macstl/vec.h 2010-04-18 14:53:09.000000000 -0700
+@@ -429,7 +429,7 @@
+
+ //@{
+ DEFINE_VEC_COMMON_UNARY_FUNCTION(operator+,identity)
+-DEFINE_VEC_COMMON_UNARY_FUNCTION(operator+,negate)
++DEFINE_VEC_COMMON_UNARY_FUNCTION(operator-,negate)
+ DEFINE_VEC_COMMON_UNARY_FUNCTION(operator~,bitwise_not)
+ //@}
+
+@@ -452,8 +452,8 @@
+ DEFINE_VEC_COMMON_BINARY_FUNCTION(operator+,plus)
+ DEFINE_VEC_COMMON_BINARY_FUNCTION(operator-,minus)
+ DEFINE_VEC_COMMON_BINARY_FUNCTION(operator^,bitwise_xor)
+-DEFINE_VEC_COMMON_BINARY_FUNCTION(operator-,bitwise_and)
+-DEFINE_VEC_COMMON_BINARY_FUNCTION(operator-,bitwise_or)
++DEFINE_VEC_COMMON_BINARY_FUNCTION(operator&,bitwise_and)
++DEFINE_VEC_COMMON_BINARY_FUNCTION(operator|,bitwise_or)
+ DEFINE_VEC_COMMON_BINARY_FUNCTION(operator<<,shift_left)
+ DEFINE_VEC_COMMON_BINARY_FUNCTION(operator>>,shift_right)
+ //@}
Index: macstl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/macstl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- macstl.info 18 Apr 2010 21:07:11 -0000 1.1
+++ macstl.info 18 Apr 2010 22:27:08 -0000 1.2
@@ -1,6 +1,6 @@
Package: macstl
Version: 0.3.1
-Revision: 1
+Revision: 2
Maintainer: David Fang <fang...@users.sourceforge.net>
Source: http://www.pixelglow.com/downloads/%n-%v.tgz
Source-MD5: 28288965464ed69718d616f7596939bb
@@ -40,7 +40,7 @@
BuildDependsOnly: true
SourceDirectory: macstl
PatchFile: %n.patch
-PatchFile-MD5: e444ebd8c137a5d26cae6d76df163d10
+PatchFile-MD5: 927766dc26976b3cb38e78e1ad725631
# ConfigureParams:
CompileScript: <<
#!/bin/sh -ev
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
