From 9d1ecd00cf53d2480ac47baa899895167b0abe88 Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 15 Feb 2005 16:53:02 +0000
Subject: Fix the build with recent GCC.

Reported by:	pointyhat.freebsd.org
---
 math/rpc/Makefile | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'math/rpc')

diff --git a/math/rpc/Makefile b/math/rpc/Makefile
index 8e58f48b66ab..b74e3e57ea30 100644
--- a/math/rpc/Makefile
+++ b/math/rpc/Makefile
@@ -19,10 +19,28 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libccm.so:${PORTSDIR}/math/ccmath
 RUN_DEPENDS=	${LOCALBASE}/lib/libccm.so:${PORTSDIR}/math/ccmath
 
 USE_GMAKE=	yes
+USE_REINPLACE=	yes	# to avoid cumbersome patching: see below
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+post-patch:
+#
+# Get rid of inline function body in implementation...
+#
+	@${REINPLACE_CMD} -e '483,488d' ${WRKSRC}/src/RpcComplex.cpp
+	@${REINPLACE_CMD} -e '428,433d' ${WRKSRC}/src/RpcComplexMatrix.cpp
+	@${REINPLACE_CMD} -e '591,596d' ${WRKSRC}/src/RpcDouble.cpp
+	@${REINPLACE_CMD} -e '350,355d' ${WRKSRC}/src/RpcIntegerConst.cpp
+	@${REINPLACE_CMD} -e '394,399d' ${WRKSRC}/src/RpcRealMatrix.cpp
+#
+# ...and put it right into class declaration instead, to please newer GCC
+#
+	@${REINPLACE_CMD} -E 's,([[:alnum:]]+ getData\( void \));,inline \1 { return data; },' \
+		${WRKSRC}/src/RpcComplex.h ${WRKSRC}/src/RpcComplexMatrix.h \
+		${WRKSRC}/src/RpcDouble.h ${WRKSRC}/src/RpcIntegerConst.h \
+		${WRKSRC}/src/RpcRealMatrix.h
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-- 
cgit v1.2.3