Attachment #202731 for bug #236409

View | Details | Raw Unified | Return to bug 236409
Collapse All | Expand All





SSE_MAKE_ARGS=	PORT_SIMD_FLAGS="-msse -msse2 -mfpmath=sse"

# It suffers from the regression in clang-6: https://bugs.llvm.org/show_bug.cgi?id=36915
LLVM_VER=	50
BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
CPP=		clang-cpp${LLVM_VER}
CC=		clang${LLVM_VER}
CXX=		clang++${LLVM_VER}

post-patch:
	@${REINPLACE_CMD} 's| -O3||' \
		${WRKSRC}/*.lv2/Makefile




--- meters.lv2/src/spectr.c.orig
+++ meters.lv2/src/spectr.c
@@ -30,10 +30,17 @@
 # define csqrt(XX) std::sqrt(XX)
 # define creal(XX) std::real(XX)
 # define cimag(XX) std::imag(XX)
-# define _I ((complex_t)(1i))
-  #ifdef __cpp_lib_complex_udls
+
+# ifdef __cpp_lib_complex_udls
     using namespace std::literals::complex_literals;
-  #endif
+# endif
+
+# if defined __clang_major__ && __clang_major__ > 4
+#  define _I (std::complex<double>(0.0,1.0))
+# else
+#  define _I ((complex_t)(1i))
+# endif
+
   typedef std::complex<double> complex_t;
 #else
 # include <complex.h>




--- onsettrigger.lv2/src/spectr.c.orig
+++ onsettrigger.lv2/src/spectr.c
@@ -30,10 +30,17 @@
 # define csqrt(XX) std::sqrt(XX)
 # define creal(XX) std::real(XX)
 # define cimag(XX) std::imag(XX)
-# define _I ((complex_t)(1i))
-  #ifdef __cpp_lib_complex_udls
+
+# ifdef __cpp_lib_complex_udls
     using namespace std::literals::complex_literals;
-  #endif
+# endif
+
+# if defined __clang_major__ && __clang_major__ > 4
+#  define _I (std::complex<double>(0.0,1.0))
+# else
+#  define _I ((complex_t)(1i))
+# endif
+
   typedef std::complex<double> complex_t;
 #else
 # include <complex.h>




--- tuna.lv2/src/spectr.c.orig
+++ tuna.lv2/src/spectr.c
@@ -30,10 +30,17 @@
 # define csqrt(XX) std::sqrt(XX)
 # define creal(XX) std::real(XX)
 # define cimag(XX) std::imag(XX)
-# define _I ((complex_t)(1i))
-  #ifdef __cpp_lib_complex_udls
+
+# ifdef __cpp_lib_complex_udls
     using namespace std::literals::complex_literals;
-  #endif
+# endif
+
+# if defined __clang_major__ && __clang_major__ > 4
+#  define _I (std::complex<double>(0.0,1.0))
+# else
+#  define _I ((complex_t)(1i))
+# endif
+
   typedef std::complex<double> complex_t;
 #else
 # include <complex.h>

Return to bug 236409

Lines 42-54 Link Here

(-)Makefile (-7 lines)
42		42
43	SSE_MAKE_ARGS= PORT_SIMD_FLAGS="-msse -msse2 -mfpmath=sse"	43	SSE_MAKE_ARGS= PORT_SIMD_FLAGS="-msse -msse2 -mfpmath=sse"
44		44
45	# It suffers from the regression in clang-6: https://bugs.llvm.org/show_bug.cgi?id=36915
46	LLVM_VER= 50
47	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
48	CPP= clang-cpp${LLVM_VER}
49	CC= clang${LLVM_VER}
50	CXX= clang++${LLVM_VER}
51
52	post-patch:	45	post-patch:
53	@${REINPLACE_CMD} 's\| -O3\|\|' \	46	@${REINPLACE_CMD} 's\| -O3\|\|' \
54	${WRKSRC}/*.lv2/Makefile	47	${WRKSRC}/*.lv2/Makefile

Line 0 Link Here

(-)files/patch-meters.lv2_src_spectr.c (+23 lines)
	1	--- meters.lv2/src/spectr.c.orig
	2	+++ meters.lv2/src/spectr.c
	3	@@ -30,10 +30,17 @@
	4	# define csqrt(XX) std::sqrt(XX)
	5	# define creal(XX) std::real(XX)
	6	# define cimag(XX) std::imag(XX)
	7	-# define _I ((complex_t)(1i))
	8	- #ifdef __cpp_lib_complex_udls
	9	+
	10	+# ifdef __cpp_lib_complex_udls
	11	using namespace std::literals::complex_literals;
	12	- #endif
	13	+# endif
	14	+
	15	+# if defined __clang_major__ && __clang_major__ > 4
	16	+# define _I (std::complex<double>(0.0,1.0))
	17	+# else
	18	+# define _I ((complex_t)(1i))
	19	+# endif
	20	+
	21	typedef std::complex<double> complex_t;
	22	#else
	23	# include <complex.h>

Line 0 Link Here

(-)files/patch-onsettrigger.lv2_src_spectr.c (+23 lines)
	1	--- onsettrigger.lv2/src/spectr.c.orig
	2	+++ onsettrigger.lv2/src/spectr.c
	3	@@ -30,10 +30,17 @@
	4	# define csqrt(XX) std::sqrt(XX)
	5	# define creal(XX) std::real(XX)
	6	# define cimag(XX) std::imag(XX)
	7	-# define _I ((complex_t)(1i))
	8	- #ifdef __cpp_lib_complex_udls
	9	+
	10	+# ifdef __cpp_lib_complex_udls
	11	using namespace std::literals::complex_literals;
	12	- #endif
	13	+# endif
	14	+
	15	+# if defined __clang_major__ && __clang_major__ > 4
	16	+# define _I (std::complex<double>(0.0,1.0))
	17	+# else
	18	+# define _I ((complex_t)(1i))
	19	+# endif
	20	+
	21	typedef std::complex<double> complex_t;
	22	#else
	23	# include <complex.h>

Line 0 Link Here

(-)files/patch-tuna.lv2_src_spectr.c (+23 lines)
	1	--- tuna.lv2/src/spectr.c.orig
	2	+++ tuna.lv2/src/spectr.c
	3	@@ -30,10 +30,17 @@
	4	# define csqrt(XX) std::sqrt(XX)
	5	# define creal(XX) std::real(XX)
	6	# define cimag(XX) std::imag(XX)
	7	-# define _I ((complex_t)(1i))
	8	- #ifdef __cpp_lib_complex_udls
	9	+
	10	+# ifdef __cpp_lib_complex_udls
	11	using namespace std::literals::complex_literals;
	12	- #endif
	13	+# endif
	14	+
	15	+# if defined __clang_major__ && __clang_major__ > 4
	16	+# define _I (std::complex<double>(0.0,1.0))
	17	+# else
	18	+# define _I ((complex_t)(1i))
	19	+# endif
	20	+
	21	typedef std::complex<double> complex_t;
	22	#else
	23	# include <complex.h>