Mon Apr 13 18:45:46 2015 UTC ()
Add volatile keyword to inline assembly tests to ensure the instructions we
are testing for are actually checked, and remove an empty list of clobbered
registers.  Fixes tests with gcc-4.2.1 on 32-bit OSX, hint from tnn@


(jperkin)
diff -r1.26 -r1.27 pkgsrc/graphics/openexr/distinfo
diff -r1.9 -r1.10 pkgsrc/graphics/openexr/patches/patch-aa
cvs diff -r1.26 -r1.27 pkgsrc/graphics/openexr/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/openexr/distinfo 2014/08/19 13:34:42 1.26
+++ pkgsrc/graphics/openexr/distinfo 2015/04/13 18:45:46 1.27
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.26 2014/08/19 13:34:42 joerg Exp $ 1$NetBSD: distinfo,v 1.27 2015/04/13 18:45:46 jperkin Exp $
2 2
3SHA1 (openexr-2.2.0.tar.gz) = d09a68c4443b7a12a0484c073adaef348b44cb92 3SHA1 (openexr-2.2.0.tar.gz) = d09a68c4443b7a12a0484c073adaef348b44cb92
4RMD160 (openexr-2.2.0.tar.gz) = a825ed42e731da3bc39f25ce2a310712a5b0f956 4RMD160 (openexr-2.2.0.tar.gz) = a825ed42e731da3bc39f25ce2a310712a5b0f956
5Size (openexr-2.2.0.tar.gz) = 14489661 bytes 5Size (openexr-2.2.0.tar.gz) = 14489661 bytes
6SHA1 (patch-IlmImf_ImfFastHuf.cpp) = bf583b5e0efb1af6e00d671b07d4cc154e13ac44 6SHA1 (patch-IlmImf_ImfFastHuf.cpp) = bf583b5e0efb1af6e00d671b07d4cc154e13ac44
7SHA1 (patch-IlmImf_ImfSystemSpecific.cpp) = 79bf644181650fa7dc13c04dfeb68142bde6a2b6 7SHA1 (patch-IlmImf_ImfSystemSpecific.cpp) = 79bf644181650fa7dc13c04dfeb68142bde6a2b6
8SHA1 (patch-IlmImf_ImfSystemSpecific.h) = f36d049085e42beabcf5f7af5354009391a1f9f2 8SHA1 (patch-IlmImf_ImfSystemSpecific.h) = f36d049085e42beabcf5f7af5354009391a1f9f2
9SHA1 (patch-aa) = 08b38d81338fc755c321911a9ffa3cccb53e99f3 9SHA1 (patch-aa) = 8633b04f9c13f163947e7ac81eb4ef7a6fd9eb88
10SHA1 (patch-ab) = 0efe7155350e1976d1d7bad9da8b1a037fd84572 10SHA1 (patch-ab) = 0efe7155350e1976d1d7bad9da8b1a037fd84572
cvs diff -r1.9 -r1.10 pkgsrc/graphics/openexr/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/openexr/patches/Attic/patch-aa 2014/08/11 19:42:46 1.9
+++ pkgsrc/graphics/openexr/patches/Attic/patch-aa 2015/04/13 18:45:46 1.10
@@ -1,29 +1,43 @@ @@ -1,29 +1,43 @@
1$NetBSD: patch-aa,v 1.9 2014/08/11 19:42:46 adam Exp $ 1$NetBSD: patch-aa,v 1.10 2015/04/13 18:45:46 jperkin Exp $
2 2
3Shell portability fix: see 3Shell portability fix: see
4https://savannah.nongnu.org/bugs/index.php?22222 4https://savannah.nongnu.org/bugs/index.php?22222
 5Ensure asm instructions are checked correctly.
5 6
6--- configure.orig 2014-08-10 04:48:26.000000000 +0000 7--- configure.orig 2014-08-10 04:48:26.000000000 +0000
7+++ configure 8+++ configure
8@@ -15660,7 +15660,7 @@ else 9@@ -15660,7 +15660,7 @@ else
9 fi 10 fi
10  11
11  12
12-if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then 13-if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
13+if test x$PKG_CONFIG = xno && test "x${multithread}" != xno ; then 14+if test x$PKG_CONFIG = xno && test "x${multithread}" != xno ; then
14  15
15  16
16  17
 18@@ -17584,10 +17584,10 @@ main ()
 19 int n = 0;
 20 int eax = 0;
 21 int edx = 0;
 22- __asm__(
 23+ __asm__ volatile (
 24 "xgetbv \n"
 25 "vzeroupper "
 26- : "=a"(eax), "=d"(edx) : "c"(n) : );
 27+ : "=a"(eax), "=d"(edx) : "c"(n) );
 28 #else
 29 #error No GCC style inline asm supported for AVX instructions
 30 #endif
17@@ -17631,7 +17631,7 @@ fi 31@@ -17631,7 +17631,7 @@ fi
18 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 32 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
19 { $as_echo "$as_me:$LINENO: result: $gcc_inline_asm_avx" >&5 33 { $as_echo "$as_me:$LINENO: result: $gcc_inline_asm_avx" >&5
20 $as_echo "$gcc_inline_asm_avx" >&6; } 34 $as_echo "$gcc_inline_asm_avx" >&6; }
21-if test "x${gcc_inline_asm_avx}" == xyes ; then 35-if test "x${gcc_inline_asm_avx}" == xyes ; then
22+if test "x${gcc_inline_asm_avx}" = xyes ; then 36+if test "x${gcc_inline_asm_avx}" = xyes ; then
23 cat >>confdefs.h <<\_ACEOF 37 cat >>confdefs.h <<\_ACEOF
24 #define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1 38 #define OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX 1
25 _ACEOF 39 _ACEOF
26@@ -17689,7 +17689,7 @@ fi 40@@ -17689,7 +17689,7 @@ fi
27 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 41 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
28 { $as_echo "$as_me:$LINENO: result: $sysconf_nproc" >&5 42 { $as_echo "$as_me:$LINENO: result: $sysconf_nproc" >&5
29 $as_echo "$sysconf_nproc" >&6; } 43 $as_echo "$sysconf_nproc" >&6; }